cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [1/2] git commit: updated refs/heads/master to b8a38ca
Date Wed, 24 Jul 2013 11:23:56 GMT
Updated Branches:
  refs/heads/master e6bad5c83 -> b8a38ca7b


CLOUDSTACK-3724: optimizing cleanup

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 8b7d00ee4de53d15a1d495c3c1fdd166b1651460)


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

Branch: refs/heads/master
Commit: 2b8f1bde8f8e3c399baf44695c10866798e1fe45
Parents: e6bad5c
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Wed Jul 24 14:10:36 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Jul 24 16:53:32 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_vpc_vms_deployment.py | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b8f1bde/test/integration/component/test_vpc_vms_deployment.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py
index 194b406..bef5f45 100644
--- a/test/integration/component/test_vpc_vms_deployment.py
+++ b/test/integration/component/test_vpc_vms_deployment.py
@@ -153,7 +153,6 @@ class Services:
                                 },
                          "ostype": 'CentOS 5.3 (64-bit)',
                          # Cent OS 5.3 (64 bit)
-                         "sleep": 60,
                          "timeout": 10,
                          "mode": 'advanced'
                     }
@@ -219,10 +218,6 @@ class TestVMDeployVPC(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:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
@@ -305,7 +300,6 @@ class TestVMDeployVPC(cloudstackTestCase):
                                      self.services["vpc_offering"]
                                      )
 
-        self._cleanup.append(vpc_off)
         self.validate_vpc_offering(vpc_off)
 
         self.debug("Enabling the VPC offering created")


Mime
View raw message