You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/07/25 01:54:51 UTC
git commit: updated refs/heads/4.2 to 60bc2cc
Updated Branches:
refs/heads/4.2 1fc633540 -> 60bc2cc28
Automation: Fix test_vpc_vms_deployment resource release
The account may be failed to be deleted in the test case, so we still need to
clean it up after.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/60bc2cc2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/60bc2cc2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/60bc2cc2
Branch: refs/heads/4.2
Commit: 60bc2cc28a6cfd0c1f1fe40669c026533d23048a
Parents: 1fc6335
Author: Sheng Yang <sh...@citrix.com>
Authored: Wed Jul 24 16:53:55 2013 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Jul 24 16:53:55 2013 -0700
----------------------------------------------------------------------
test/integration/component/test_vpc_vms_deployment.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60bc2cc2/test/integration/component/test_vpc_vms_deployment.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py
index bef5f45..a697fc3 100644
--- a/test/integration/component/test_vpc_vms_deployment.py
+++ b/test/integration/component/test_vpc_vms_deployment.py
@@ -1746,9 +1746,6 @@ class TestVMDeployVPC(cloudstackTestCase):
# expected
# 2. All the resources associated with account should be deleted
- # Remove account from cleanup list, we will delete it at end of test
- self.cleanup = []
-
self.debug("Creating a VPC offering..")
vpc_off = VpcOffering.create(
self.apiclient,
@@ -2427,6 +2424,9 @@ class TestVMDeployVPC(cloudstackTestCase):
self.account.name)
wait_for_cleanup(self.apiclient, ["account.cleanup.interval"])
+ # Remove account from cleanup list, we've already deleted it
+ self.cleanup.remove(self.account)
+
self.debug("Check if the VPC network is created successfully?")
vpc_networks = VPC.list(
self.apiclient,