cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject git commit: updated refs/heads/4.4-forward to 362f89b
Date Fri, 02 May 2014 12:01:41 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward fa4e7fc7f -> 362f89b9e


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/362f89b9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/362f89b9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/362f89b9

Branch: refs/heads/4.4-forward
Commit: 362f89b9e1e93fc4e8d332d94ba8551e2db76977
Parents: fa4e7fc
Author: Koushik Das <koushik@apache.org>
Authored: Fri May 2 17:29:23 2014 +0530
Committer: Koushik Das <koushik@apache.org>
Committed: Fri May 2 17:29:23 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/362f89b9/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 ae5b51f..2dd514d 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)


Mime
View raw message