cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [16/50] [abbrv] git commit: updated refs/heads/ui-ucs to 9334dab
Date Tue, 09 Jul 2013 20:45:58 GMT
do not wait for cleanup

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


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

Branch: refs/heads/ui-ucs
Commit: 67355327653dd53311a543373ac55f63b04ea525
Parents: f337fed
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Sat Jul 6 20:17:51 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat Jul 6 20:18:23 2013 +0530

----------------------------------------------------------------------
 .../component/maint/test_vpc_host_maintenance.py      |  4 ----
 .../component/test_vpc_network_staticnatrule.py       |  4 ++--
 test/integration/component/test_vpc_routers.py        | 14 --------------
 3 files changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67355327/test/integration/component/maint/test_vpc_host_maintenance.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_vpc_host_maintenance.py b/test/integration/component/maint/test_vpc_host_maintenance.py
index 8fc427a..0946ceb 100644
--- a/test/integration/component/maint/test_vpc_host_maintenance.py
+++ b/test/integration/component/maint/test_vpc_host_maintenance.py
@@ -332,10 +332,6 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
             wait_for_cleanup(cls.api_client, ["account.cleanup.interval"])
             #Cleanup resources used
             cleanup_resources(cls.api_client, cls._cleanup)
-
-            # Waiting for network cleanup to delete vpc offering
-            wait_for_cleanup(cls.api_client, ["network.gc.wait",
-                                              "network.gc.interval"])
             cls.vpc_off.delete(cls.api_client)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67355327/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 c064053..80e8477 100644
--- a/test/integration/component/test_vpc_network_staticnatrule.py
+++ b/test/integration/component/test_vpc_network_staticnatrule.py
@@ -332,9 +332,9 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         try:
                 urllib.urlretrieve("http://%s/test.html" % public_ip.ipaddress.ipaddress,
filename="test.html")
                 if not testnegative:
-                    self.debug("Successesfull to wget from VM=%s http server on public_ip=%s"
% (vm.name, public_ip.ipaddress.ipaddress))
+                    self.debug("Successful to wget from VM=%s http server on public_ip=%s"
% (vm.name, public_ip.ipaddress.ipaddress))
                 else:
-                    self.fail("Successesfull to wget from VM=%s http server on public_ip=%s"
% (vm.name, public_ip.ipaddress.ipaddress))
+                    self.fail("Successful to wget from VM=%s http server on public_ip=%s"
% (vm.name, public_ip.ipaddress.ipaddress))
         except:
                 if not testnegative:
                     self.fail("Failed to wget from VM=%s http server on public_ip=%s" % (vm.name,
public_ip.ipaddress.ipaddress))

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67355327/test/integration/component/test_vpc_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py
index 3501110..43116b0 100644
--- a/test/integration/component/test_vpc_routers.py
+++ b/test/integration/component/test_vpc_routers.py
@@ -227,8 +227,6 @@ class TestVPCRoutersBasic(cloudstackTestCase):
             cleanup_resources(cls.apiclient, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
-        
-        wait_for_cleanup(cls.apiclient, ["account.cleanup.interval"])
         return
 
     def setUp(self):
@@ -820,8 +818,6 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
             cleanup_resources(cls.apiclient, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
-        
-        wait_for_cleanup(cls.apiclient, ["account.cleanup.interval"])
         return
 
     def setUp(self):
@@ -839,16 +835,6 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
         try:
             #Clean up, terminate the created network offerings
             cleanup_resources(self.apiclient, self.cleanup)
-            interval = list_configurations(
-                                    self.apiclient,
-                                    name='network.gc.interval'
-                                    )
-            wait = list_configurations(
-                                    self.apiclient,
-                                    name='network.gc.wait'
-                                   )
-            # Sleep to ensure that all resources are deleted
-            time.sleep(int(interval[0].value) + int(wait[0].value))
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
        


Mime
View raw message