cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [28/50] [abbrv] git commit: updated refs/heads/saml2 to ba68616
Date Sun, 24 Aug 2014 14:04:48 GMT
CLOUDSTACK-7367: Corrected script in test_add_remove_network.py related to expunge VM


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4e115c28
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e115c28
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e115c28

Branch: refs/heads/saml2
Commit: 4e115c28a6c6fa9720941261d89c1b96394481d5
Parents: 09b09c1
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Fri Aug 22 16:47:04 2014 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Fri Aug 22 17:24:43 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_add_remove_network.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e115c28/test/integration/component/test_add_remove_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_add_remove_network.py b/test/integration/component/test_add_remove_network.py
index 9b57761..bc9be6f 100644
--- a/test/integration/component/test_add_remove_network.py
+++ b/test/integration/component/test_add_remove_network.py
@@ -1751,7 +1751,7 @@ class TestFailureScenariosUpdateVirtualMachineNIC(cloudstackTestCase):
         virtual_machine.add_nic(self.apiclient, isolated_network.id)
 
         self.debug("Listing virtual machine so that to retrive the list of non-default and
default nic")
-        vm_list = list_virtual_machines(self.apiclient, id=virtual_machine.id)
+        vm_list = list_virtual_machines(self.apiclient, id=virtual_machine.id, listall=True)
         vm_list_validation_result = validateList(vm_list)
         self.assertEqual(vm_list_validation_result[0], PASS, "vm list validation failed due
to %s" %
 			 vm_list_validation_result[2])
@@ -1771,7 +1771,7 @@ class TestFailureScenariosUpdateVirtualMachineNIC(cloudstackTestCase):
         self.debug("Default nic of VM is %s and non default nic of VM is %s"
                     % (defaultNicIdBeforeUpdate, nonDefaultNicIdBeforeUpdate))
         self.debug("Destroying VM %s" % virtual_machine.id)
-        virtual_machine.delete(self.apiclient)
+        virtual_machine.delete(self.apiclient, expunge=False)
 
         self.debug("Making non default nic as default nic")
 


Mime
View raw message