cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [13/50] git commit: updated refs/heads/saml2 to 09da909
Date Sat, 16 Aug 2014 10:55:44 GMT
CLOUDSTACK-7284: Fixed test script related to expunge VM in test_add_remove_network.py


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

Branch: refs/heads/saml2
Commit: 76cecc325fca5ead8b610c49608cb8fe8a4395c5
Parents: f9a6665
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue Aug 12 16:30:44 2014 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Wed Aug 13 11:32:23 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_add_remove_network.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76cecc32/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 2bd6ec2..34af7bc 100644
--- a/test/integration/component/test_add_remove_network.py
+++ b/test/integration/component/test_add_remove_network.py
@@ -1770,28 +1770,17 @@ class TestFailureScenariosUpdateVirtualMachineNIC(cloudstackTestCase):
                     % (defaultNicIdBeforeUpdate, nonDefaultNicIdBeforeUpdate))
         self.debug("Destroying VM %s" % virtual_machine.id)
         virtual_machine.delete(self.apiclient)
-        vm_list = list_virtual_machines(self.apiclient, id=virtual_machine.id)
-        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])
-        vm = vm_list_validation_result[1]
-        vm_state = vm.state.lower()
-        self.debug("VM state is: %s" % vm_state)
-        if vm_state in ["running", "stopped"]:
-            self.fail("failed to destroy the instance: %s" % vm.id)
 
         self.debug("Making non default nic as default nic")
 
         cmd = updateDefaultNicForVirtualMachine.updateDefaultNicForVirtualMachineCmd()
-        cmd.virtualmachineid  = vm.id
+        cmd.virtualmachineid  = virtual_machine.id
         cmd.nicid = nonDefaultNicIdBeforeUpdate
 
         with self.assertRaises(Exception) as e:
             self.apiclient.updateDefaultNicForVirtualMachine(cmd)
             self.debug("updateDefaultNicForVirtualMachine API failed with exception: %s"
%
                     e.exception)
-
         return
 
     @attr(tags = ["advanced"])


Mime
View raw message