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-6-17-stable to 5970b39
Date Sat, 06 Jul 2013 13:51:18 GMT
Updated Branches:
  refs/heads/master-6-17-stable 8b9c15731 -> 5970b3927


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)


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

Branch: refs/heads/master-6-17-stable
Commit: 5970b3927dbd4ff6761815788a129df08bdfa84b
Parents: 8b9c157
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Sat Jul 6 19:19:02 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat Jul 6 19:21:08 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/5970b392/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/5970b392/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/5970b392/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)


Mime
View raw message