mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
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 620ed6e0f177bf32aa8d966cade07b93c7045dc9)
This commit is contained in:
parent
14c9a159a5
commit
f337fed1ec
@ -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)
|
||||
|
||||
@ -37,7 +37,6 @@ from marvin.integration.lib.common import (get_domain,
|
||||
get_zone,
|
||||
get_template,
|
||||
cleanup_resources,
|
||||
wait_for_cleanup,
|
||||
list_routers)
|
||||
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user