LGTM On Mon, Oct 26, 2015 at 11:44 AM Oleg Ponomarev <[email protected]> wrote:
> LGTM, thanks > > On Monday, October 26, 2015 at 1:32:33 PM UTC+3, Klaus Aehlig wrote: >> >> As the maintd tests hard-code the use of drbd as disk template, >> we can only run them, if this template is enabled. >> >> Signed-off-by: Klaus Aehlig <[email protected]> >> > --- >> qa/ganeti-qa.py | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py >> index 1191ab0..9b475e2 100755 >> --- a/qa/ganeti-qa.py >> +++ b/qa/ganeti-qa.py >> @@ -890,11 +890,11 @@ def RunMonitoringTests(): >> >> >> def RunMaintdTests(): >> - RunTestIf("maintd", qa_maintd.TestEvacuate) >> - RunTestIf("maintd", qa_maintd.TestEvacuateFailover) >> - if constants.ENABLE_RESTRICTED_COMMANDS: >> - RunTestIf("maintd", qa_maintd.TestLiveRepair) >> - >> + if constants.DT_DRBD8 in qa_config.GetEnabledDiskTemplates(): >> + RunTestIf("maintd", qa_maintd.TestEvacuate) >> + RunTestIf("maintd", qa_maintd.TestEvacuateFailover) >> + if constants.ENABLE_RESTRICTED_COMMANDS: >> + RunTestIf("maintd", qa_maintd.TestLiveRepair) >> >> PARALLEL_TEST_DICT = { >> "parallel-failover": qa_performance.TestParallelInstanceFailover, >> -- >> 2.6.0.rc2.230.g3dd15c0 >> >> -- Lisa Velden Software Engineer [email protected] Google Germany GmbH Dienerstraße 12 80331 München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg
