apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Automation: Fix different names for cleanup

Browse Source
This commit is contained in:
Sheng Yang 2013-07-23 13:11:20 -07:00
parent c1e6968464
commit 7faa71dc68
6 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/component/test_blocker_bugs.py
View File

@ -611,10 +611,7 @@ class TestRouterRestart(cloudstackTestCase):
return return
def tearDown(self): def tearDown(self):
try: # No need
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return return
@attr(tags = ["advanced", "basic", "sg", "advancedns", "eip"]) @attr(tags = ["advanced", "basic", "sg", "advancedns", "eip"])

8
test/integration/component/test_redundant_router.py
View File

@ -288,7 +288,7 @@ class TestCreateRvRNetwork(cloudstackTestCase):
def tearDown(self): def tearDown(self):
try: try:
cleanup_resources(self.apiclient, self.cleanup) cleanup_resources(self.apiclient, self._cleanup)
except Exception as e: except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e) raise Exception("Warning: Exception during cleanup : %s" % e)
return return
@ -486,7 +486,7 @@ class TestCreateRvRNetworkNonDefaultGuestCidr(cloudstackTestCase):
def tearDown(self): def tearDown(self):
try: try:
cleanup_resources(self.apiclient, self.cleanup) cleanup_resources(self.apiclient, self._cleanup)
except Exception as e: except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e) raise Exception("Warning: Exception during cleanup : %s" % e)
return return
@ -693,7 +693,7 @@ class TestRVRInternals(cloudstackTestCase):
def tearDown(self): def tearDown(self):
try: try:
cleanup_resources(self.apiclient, self.cleanup) cleanup_resources(self.apiclient, self._cleanup)
except Exception as e: except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e) raise Exception("Warning: Exception during cleanup : %s" % e)
return return
@ -1013,7 +1013,7 @@ class TestRvRRedundancy(cloudstackTestCase):
def tearDown(self): def tearDown(self):
try: try:
cleanup_resources(self.apiclient, self.cleanup) cleanup_resources(self.apiclient, self._cleanup)
except Exception as e: except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e) raise Exception("Warning: Exception during cleanup : %s" % e)
return return

2
test/integration/component/test_redundant_router_services.py
View File

@ -195,7 +195,7 @@ class TestEnableVPNOverRvR(cloudstackTestCase):
def tearDown(self): def tearDown(self):
try: try:
cleanup_resources(self.apiclient, self.cleanup) cleanup_resources(self.apiclient, self._cleanup)
except Exception as e: except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e) raise Exception("Warning: Exception during cleanup : %s" % e)
return return

2
test/integration/component/test_redundant_router_upgrades.py
View File

@ -194,7 +194,7 @@ class TestRvRUpgradeDowngrade(cloudstackTestCase):
def tearDown(self): def tearDown(self):
try: try:
cleanup_resources(self.apiclient, self.cleanup) cleanup_resources(self.apiclient, self._cleanup)
except Exception as e: except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e) raise Exception("Warning: Exception during cleanup : %s" % e)
return return

24
test/integration/component/test_volumes.py
View File

@ -162,12 +162,20 @@ class TestAttachVolume(cloudstackTestCase):
def tearDown(self): def tearDown(self):
try: try:
cleanup_resources(self.apiclient, self._cleanup) cleanup_resources(self.apiclient, self.cleanup)
except Exception as e: except Exception as e:
self.debug("Warning: Exception during cleanup : %s" % e) self.debug("Warning: Exception during cleanup : %s" % e)
#raise Exception("Warning: Exception during cleanup : %s" % e) #raise Exception("Warning: Exception during cleanup : %s" % e)
return 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"]) @attr(tags = ["advanced", "advancedns"])
def test_01_volume_attach(self): def test_01_volume_attach(self):
"""Test Attach volumes (max capacity) """Test Attach volumes (max capacity)
@ -370,20 +378,6 @@ class TestAttachVolume(cloudstackTestCase):
) )
return 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): class TestAttachDetachVolume(cloudstackTestCase):
@classmethod @classmethod

2
test/integration/component/test_vpc_offerings.py
View File

@ -185,7 +185,7 @@ class TestVPCOffering(cloudstackTestCase):
def tearDown(self): def tearDown(self):
try: try:
cleanup_resources(self.apiclient, self.cleanup) cleanup_resources(self.apiclient, self._cleanup)
except Exception as e: except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e) raise Exception("Warning: Exception during cleanup : %s" % e)
return return