etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not wait for cleanup 

simply cleanup and exit and network.gc will happen later

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 620ed6e0f1)
This commit is contained in:
Prasanna Santhanam 2013-07-06 19:19:02 +05:30
parent 14c9a159a5
commit f337fed1ec
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/component/test_vpc_network_lbrules.py
View File

@ -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)

1
test/integration/component/test_vpc_network_pfrules.py
View File

@ -37,7 +37,6 @@ from marvin.integration.lib.common import (get_domain,
get_zone,
get_template,
cleanup_resources,
wait_for_cleanup,
list_routers)

4
test/integration/component/test_vpc_network_staticnatrule.py
View File

@ -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)