cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/4.2 to 9c0620f
Date Tue, 23 Jul 2013 20:14:57 GMT
Updated Branches:
  refs/heads/4.2 a7359708a -> 9c0620f71


Automation: Fix different names for cleanup


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

Branch: refs/heads/4.2
Commit: 9c0620f71e85d2935ec6500020835c287310c65e
Parents: a735970
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Tue Jul 23 13:11:20 2013 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Tue Jul 23 13:14:34 2013 -0700

----------------------------------------------------------------------
 test/integration/component/test_blocker_bugs.py |  5 +---
 .../component/test_redundant_router.py          |  8 +++----
 .../component/test_redundant_router_services.py |  2 +-
 .../component/test_redundant_router_upgrades.py |  2 +-
 test/integration/component/test_volumes.py      | 24 ++++++++------------
 .../integration/component/test_vpc_offerings.py |  2 +-
 6 files changed, 17 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0620f7/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index 8a73b91..7ff6315 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -611,10 +611,7 @@ class TestRouterRestart(cloudstackTestCase):
         return
 
     def tearDown(self):
-        try:
-            cleanup_resources(self.apiclient, self.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
+        # No need
         return
 
     @attr(tags = ["advanced", "basic", "sg", "advancedns", "eip"])

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0620f7/test/integration/component/test_redundant_router.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_redundant_router.py b/test/integration/component/test_redundant_router.py
index 08abd09..55f0710 100644
--- a/test/integration/component/test_redundant_router.py
+++ b/test/integration/component/test_redundant_router.py
@@ -288,7 +288,7 @@ class TestCreateRvRNetwork(cloudstackTestCase):
 
     def tearDown(self):
         try:
-            cleanup_resources(self.apiclient, self.cleanup)
+            cleanup_resources(self.apiclient, self._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
@@ -486,7 +486,7 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
 
     def tearDown(self):
         try:
-            cleanup_resources(self.apiclient, self.cleanup)
+            cleanup_resources(self.apiclient, self._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
@@ -693,7 +693,7 @@ class TestRVRInternals(cloudstackTestCase):
 
     def tearDown(self):
         try:
-            cleanup_resources(self.apiclient, self.cleanup)
+            cleanup_resources(self.apiclient, self._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
@@ -1013,7 +1013,7 @@ class TestRvRRedundancy(cloudstackTestCase):
 
     def tearDown(self):
         try:
-            cleanup_resources(self.apiclient, self.cleanup)
+            cleanup_resources(self.apiclient, self._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0620f7/test/integration/component/test_redundant_router_services.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_redundant_router_services.py b/test/integration/component/test_redundant_router_services.py
index d5afe29..59f9edc 100644
--- a/test/integration/component/test_redundant_router_services.py
+++ b/test/integration/component/test_redundant_router_services.py
@@ -195,7 +195,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
 
     def tearDown(self):
         try:
-            cleanup_resources(self.apiclient, self.cleanup)
+            cleanup_resources(self.apiclient, self._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0620f7/test/integration/component/test_redundant_router_upgrades.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_redundant_router_upgrades.py b/test/integration/component/test_redundant_router_upgrades.py
index da3b9b0..e67507a 100644
--- a/test/integration/component/test_redundant_router_upgrades.py
+++ b/test/integration/component/test_redundant_router_upgrades.py
@@ -194,7 +194,7 @@ class TestRvRUpgradeDowngrade(cloudstackTestCase):
 
     def tearDown(self):
         try:
-            cleanup_resources(self.apiclient, self.cleanup)
+            cleanup_resources(self.apiclient, self._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0620f7/test/integration/component/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py
index b894b1f..2c2301a 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -162,12 +162,20 @@ class TestAttachVolume(cloudstackTestCase):
 
     def tearDown(self):
         try:
-            cleanup_resources(self.apiclient, self._cleanup)
+            cleanup_resources(self.apiclient, self.cleanup)
         except Exception as e:
             self.debug("Warning: Exception during cleanup : %s" % e)
             #raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            cls.api_client = super(TestAttachVolume, cls).getClsTestClient().getApiClient()
+            cleanup_resources(cls.api_client, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+
     @attr(tags = ["advanced", "advancedns"])
     def test_01_volume_attach(self):
         """Test Attach volumes (max capacity)
@@ -370,20 +378,6 @@ class TestAttachVolume(cloudstackTestCase):
                                                 )
         return
 
-    def tearDown(self):
-        #Clean up, terminate the created volumes
-        cleanup_resources(self.apiclient, self.cleanup)
-        return
-
-    @classmethod
-    def tearDownClass(cls):
-        try:
-            cls.api_client = super(TestAttachVolume, cls).getClsTestClient().getApiClient()
-            cleanup_resources(cls.api_client, cls._cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-
-
 class TestAttachDetachVolume(cloudstackTestCase):
 
     @classmethod

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0620f7/test/integration/component/test_vpc_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py
index 28af16a..d1d7c6c 100644
--- a/test/integration/component/test_vpc_offerings.py
+++ b/test/integration/component/test_vpc_offerings.py
@@ -185,7 +185,7 @@ class TestVPCOffering(cloudstackTestCase):
 
     def tearDown(self):
         try:
-            cleanup_resources(self.apiclient, self.cleanup)
+            cleanup_resources(self.apiclient, self._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return


Mime
View raw message