You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2013/12/04 07:08:45 UTC
git commit: updated refs/heads/4.2 to 8525dfd
Updated Branches:
refs/heads/4.2 454912d7b -> 8525dfd93
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/8525dfd9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8525dfd9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8525dfd9
Branch: refs/heads/4.2
Commit: 8525dfd9310df409a7ddcb925e6b85299f6e4436
Parents: 454912d
Author: Ashutosh K <as...@clogeny.com>
Authored: Wed Dec 4 11:37:22 2013 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Wed Dec 4 11:38:36 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/8525dfd9/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 aed9f95..5ce94f2 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -1395,6 +1395,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:
@@ -1603,7 +1617,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)
@@ -1623,7 +1637,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)