Updated Branches: refs/heads/4.3 fd43fa13c -> 0aa17c421
CLOUDSTACK-5230: Removing test cases' dependency on each other leading to failures Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0aa17c42 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0aa17c42 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0aa17c42 Branch: refs/heads/4.3 Commit: 0aa17c4213adb5ec513151478c578015c6690050 Parents: fd43fa1 Author: Ashutosh K <[email protected]> Authored: Wed Dec 4 11:37:22 2013 +0530 Committer: Girish Shilamkar <[email protected]> Committed: Wed Dec 4 11:38:22 2013 +0530 ---------------------------------------------------------------------- .../component/test_vpc_vm_life_cycle.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0aa17c42/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 a94c4ce..3421bbc 100644 --- a/test/integration/component/test_vpc_vm_life_cycle.py +++ b/test/integration/component/test_vpc_vm_life_cycle.py @@ -1396,6 +1396,20 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase): """ Test recover an instance in VPC networks """ + self.debug("Deploying vm") + + self.vm_2 = VirtualMachine.create( + self.api_client, + self.services["virtual_machine"], + accountid=self.account.name, + domainid=self.account.domainid, + serviceofferingid=self.service_offering.id, + networkids=[str(self.network_1.id), + str(self.network_2.id)] + ) + + self.cleanup.append(self.vm_2) + try: self.vm_2.delete(self.apiclient) except Exception as e: @@ -1604,7 +1618,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase): self.debug("Delete virtual machines in account: %s" % self.account.name) try: - 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) @@ -1624,7 +1638,6 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase): self.account.name) try: self.vm_1.delete(self.apiclient) - self.vm_3.delete(self.apiclient) except Exception as e: self.fail("Failed to destroy the virtual instances, %s" % e)
