You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/06/28 21:22:25 UTC
[04/29] git commit: updated refs/heads/master-6-17-stable to 93712c2
Don't wait for account gc
Account GC is automatic, it's not required to wait for cleanup in the
tearDown method
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit b91978545acd2513754e20b7dfabcbf4b745dd0a)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d4a64c7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d4a64c7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d4a64c7
Branch: refs/heads/master-6-17-stable
Commit: 9d4a64c74809ece2246585b9d9bc853bec1fe149
Parents: b952415
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Wed Jun 19 15:16:45 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jun 29 00:52:07 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_vpc.py | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d4a64c7/test/integration/component/test_vpc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc.py b/test/integration/component/test_vpc.py
index cc70695..742f6ae 100644
--- a/test/integration/component/test_vpc.py
+++ b/test/integration/component/test_vpc.py
@@ -224,25 +224,7 @@ class TestVPC(cloudstackTestCase):
admin=True,
domainid=self.domain.id
)
- self.cleanup = [self.account]
- return
-
- def tearDown(self):
- try:
- #Clean up, terminate the created network offerings
- cleanup_resources(self.apiclient, self.cleanup)
- interval = list_configurations(
- self.apiclient,
- name='network.gc.interval'
- )
- wait = list_configurations(
- self.apiclient,
- name='network.gc.wait'
- )
- # Sleep to ensure that all resources are deleted
- time.sleep(int(interval[0].value) + int(wait[0].value))
- except Exception as e:
- raise Exception("Warning: Exception during cleanup : %s" % e)
+ self._cleanup.insert(0, self.account)
return
def validate_vpc_offering(self, vpc_offering):