You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2014/05/02 14:02:30 UTC
git commit: updated refs/heads/master to 82c0827
Repository: cloudstack
Updated Branches:
refs/heads/master a7004db7c -> 82c082792
CLOUDSTACK-6445: Minor fixes in vm ha test
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/82c08279
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/82c08279
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/82c08279
Branch: refs/heads/master
Commit: 82c082792ef0ec0a98604c7686f755adce511cc5
Parents: a7004db
Author: Koushik Das <ko...@apache.org>
Authored: Fri May 2 17:29:23 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Fri May 2 17:32:07 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_vm_ha.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/82c08279/test/integration/smoke/test_vm_ha.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_ha.py b/test/integration/smoke/test_vm_ha.py
index 197814d..f549243 100644
--- a/test/integration/smoke/test_vm_ha.py
+++ b/test/integration/smoke/test_vm_ha.py
@@ -65,7 +65,7 @@ class TestData(object):
"offerha": True,
},
},
- "ostype": 'CentOS 5.3 (32-bit)',
+ "ostype": 'CentOS 5.3 (64-bit)',
}
@@ -198,7 +198,7 @@ class TestDeployVMHA(cloudstackTestCase):
list_vms = VirtualMachine.list(self.apiclient, id=self.virtual_machine.id)
self.assertTrue(isinstance(list_vms, list) and len(list_vms) == 1, msg = "List VM response was empty")
vm = list_vms[0]
- if vm.hostid != self.virtual_machine.hostid:
+ if vm.hostid != self.virtual_machine.hostid and vm.state == "Running":
break
else:
time.sleep(10)