Repository: cloudstack Updated Branches: refs/heads/master d80f6a8d4 -> 402fc914c
CLOUDSTACK-7393: Expunging VM immediately and removing unncessary wait in test_vpc_vm_life_cycle.py Signed-off-by: SrikanteswaraRao Talluri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/402fc914 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/402fc914 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/402fc914 Branch: refs/heads/master Commit: 402fc914cf4047b7faf1b1410972bb5a4ae5b29d Parents: d80f6a8 Author: Gaurav Aradhye <[email protected]> Authored: Mon Sep 8 18:59:17 2014 +0530 Committer: SrikanteswaraRao Talluri <[email protected]> Committed: Tue Sep 9 11:43:54 2014 +0530 ---------------------------------------------------------------------- .../component/test_vpc_vm_life_cycle.py | 55 ++------------------ 1 file changed, 3 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/402fc914/test/integration/component/test_vpc_vm_life_cycle.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py index 8fc6d62..e8df680 100644 --- a/test/integration/component/test_vpc_vm_life_cycle.py +++ b/test/integration/component/test_vpc_vm_life_cycle.py @@ -3509,61 +3509,12 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase): self.debug("Delete virtual machines in account: %s" % self.account.name) try: - self.vm_1.delete(self.apiclient, expunge=False) - - list_vm_response = list_virtual_machines( - self.apiclient, - id=self.vm_1.id - ) - - vm_response = list_vm_response[0] - - self.assertEqual( - vm_response.state, - 'Destroyed', - "VM state should be destroyed" - ) - - self.vm_2.delete(self.apiclient, expunge=False) - - list_vm_response = list_virtual_machines( - self.apiclient, - id=self.vm_2.id - ) - - vm_response = list_vm_response[0] - - self.assertEqual( - vm_response.state, - 'Destroyed', - "VM state should be destroyed" - ) - - self.vm_3.delete(self.apiclient, expunge=False) - - list_vm_response = list_virtual_machines( - self.apiclient, - id=self.vm_3.id - ) - - vm_response = list_vm_response[0] - - self.assertEqual( - vm_response.state, - 'Destroyed', - "VM state should be destroyed" - ) + self.vm_1.delete(self.apiclient) + self.vm_2.delete(self.apiclient) + self.vm_3.delete(self.apiclient) except Exception as e: self.fail("Failed to destroy the virtual instances, %s" % e) - self.debug( - "Waiting for expunge interval to cleanup the network and VMs") - - wait_for_cleanup( - self.apiclient, - ["expunge.interval", "expunge.delay"] - ) - # Check if the network rules still exists after Vm stop self.debug("Checking if NAT rules existed") with self.assertRaises(Exception):
