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/07/06 15:50:05 UTC
git commit: updated refs/heads/4.2 to 620ed6e
Updated Branches:
refs/heads/4.2 b59f6abe8 -> 620ed6e0f
do not wait for cleanup
simply cleanup and exit and network.gc will happen later
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/620ed6e0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/620ed6e0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/620ed6e0
Branch: refs/heads/4.2
Commit: 620ed6e0f177bf32aa8d966cade07b93c7045dc9
Parents: b59f6ab
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Sat Jul 6 19:19:02 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jul 6 19:19:02 2013 +0530
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/620ed6e0/test/integration/component/test_vpc_network_lbrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py
index 865cf0e..a1dd19b 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)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/620ed6e0/test/integration/component/test_vpc_network_pfrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py
index ad7bbae..64a6aa2 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)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/620ed6e0/test/integration/component/test_vpc_network_staticnatrule.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py
index 1410f5e..c064053 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)