From 76f59a328bd010a982f0621576851a4c041f313d Mon Sep 17 00:00:00 2001 From: Michael Hanselmann Date: Fri, 6 Jun 2008 09:32:24 +0000 Subject: [PATCH 1/1] Forward-port: Fix two problems in QA scripts - Failover back to original node in instance failure test - Exclude secondary node from list of potential nodes in replace-disks test Reviewed-by: iustinp --- qa/ganeti-qa.py | 2 +- qa/qa_instance.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py index 3278c1a..599eabb 100755 --- a/qa/ganeti-qa.py +++ b/qa/ganeti-qa.py @@ -211,7 +211,7 @@ def RunHardwareFailureTests(instance, pnode, snode): RunTest(qa_instance.TestInstanceFailover, instance) if qa_config.TestEnabled('instance-replace-disks'): - othernode = qa_config.AcquireNode(exclude=pnode) + othernode = qa_config.AcquireNode(exclude=[pnode, snode]) try: RunTest(qa_instance.TestReplaceDisks, instance, pnode, snode, othernode) diff --git a/qa/qa_instance.py b/qa/qa_instance.py index ae35bf9..b2e8f46 100644 --- a/qa/qa_instance.py +++ b/qa/qa_instance.py @@ -142,6 +142,11 @@ def TestInstanceFailover(instance): AssertEqual(StartSSH(master['primary'], utils.ShellQuoteArgs(cmd)).wait(), 0) + # ... and back + cmd = ['gnt-instance', 'failover', '--force', instance['name']] + AssertEqual(StartSSH(master['primary'], + utils.ShellQuoteArgs(cmd)).wait(), 0) + @qa_utils.DefineHook('instance-info') def TestInstanceInfo(instance): -- 1.7.10.4