cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/master to b919785
Date Wed, 19 Jun 2013 09:47:27 GMT
Updated Branches:
  refs/heads/master 13e1f4fc1 -> b91978545


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 <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9197854
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9197854
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9197854

Branch: refs/heads/master
Commit: b91978545acd2513754e20b7dfabcbf4b745dd0a
Parents: 13e1f4f
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Wed Jun 19 15:16:45 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Jun 19 15:16:45 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/b9197854/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):


Mime
View raw message