From f337fed1ecdea2bc9c66620463a66c66122ee06a Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Sat, 6 Jul 2013 19:19:02 +0530 Subject: [PATCH] do not wait for cleanup simply cleanup and exit and network.gc will happen later Signed-off-by: Prasanna Santhanam (cherry picked from commit 620ed6e0f177bf32aa8d966cade07b93c7045dc9) --- test/integration/component/test_vpc_network_lbrules.py | 5 ----- test/integration/component/test_vpc_network_pfrules.py | 1 - test/integration/component/test_vpc_network_staticnatrule.py | 4 ---- 3 files changed, 10 deletions(-) diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py index 865cf0e2a78..a1dd19b4134 100644 --- a/test/integration/component/test_vpc_network_lbrules.py +++ b/test/integration/component/test_vpc_network_lbrules.py @@ -41,7 +41,6 @@ from marvin.integration.lib.common import (get_domain, get_zone, get_template, cleanup_resources, - wait_for_cleanup, list_routers) class Services: @@ -249,10 +248,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase): try: #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self._cleanup) - wait_for_cleanup(self.apiclient, [ - "network.gc.interval", - "network.gc.wait"]) - except Exception as e: self.debug("Warning: Exception during cleanup : %s" % e) #raise Exception("Warning: Exception during cleanup : %s" % e) diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py index ad7bbae7fe7..64a6aa23770 100644 --- a/test/integration/component/test_vpc_network_pfrules.py +++ b/test/integration/component/test_vpc_network_pfrules.py @@ -37,7 +37,6 @@ from marvin.integration.lib.common import (get_domain, get_zone, get_template, cleanup_resources, - wait_for_cleanup, list_routers) diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py index 1410f5e50c5..c064053995e 100644 --- a/test/integration/component/test_vpc_network_staticnatrule.py +++ b/test/integration/component/test_vpc_network_staticnatrule.py @@ -37,7 +37,6 @@ from marvin.integration.lib.common import (get_domain, get_zone, get_template, cleanup_resources, - wait_for_cleanup, list_routers) @@ -248,9 +247,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase): try: #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self._cleanup) - wait_for_cleanup(self.apiclient, [ - "network.gc.interval", - "network.gc.wait"]) except Exception as e: self.debug("Warning: Exception during cleanup : %s" % e) #raise Exception("Warning: Exception during cleanup : %s" % e)