Skip to content

default teardown methods with reversed() handling #4289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 17 commits into from
Nov 13, 2020
Merged

default teardown methods with reversed() handling #4289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e5a4169
default teardown methods with reversed() handling
DaanHoogland Aug 27, 2020
bcec4a9
two examples of teardown from super
DaanHoogland Aug 27, 2020
9fc5002
call super in test account classes
Oct 15, 2020
d68630b
super call for self instead of class
Oct 15, 2020
d864377
cleanup conditional
DaanHoogland Oct 16, 2020
73483d2
deal with different namings
Oct 19, 2020
d97e8d7
self vs cls
Oct 19, 2020
663515f
cleanup of cleanup member
DaanHoogland Oct 20, 2020
5a34f77
cleanup cleanup in failing tests
DaanHoogland Oct 27, 2020
1993615
cleanup imports and setup cleanup methods
DaanHoogland Oct 28, 2020
d71a6fb
cleanup imports
DaanHoogland Oct 28, 2020
857c667
add vm to cleanup list
DaanHoogland Nov 9, 2020
2e9c3aa
extra objects to clean up
DaanHoogland Nov 9, 2020
bfcac01
method name
DaanHoogland Nov 9, 2020
69bf1d3
further objects added to cleanup list
Nov 10, 2020
eea210b
method inserted at the wrong place in file
DaanHoogland Nov 11, 2020
6b3dbc3
network and vm cleaning (order)
DaanHoogland Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions test/integration/component/test_volumes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,11 +1454,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestMigrateVolume,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -1470,8 +1466,7 @@ def setUp(self):
return

def tearDown(self):
cleanup_resources(self.apiclient, self.cleanup)
return
super(TestMigrateVolume,self).tearDown()

@attr(tags=["advanced", "sg", "advancedsg"], required_hardware='true')
def test_01_migrateVolume(self):
Expand Down
170 changes: 24 additions & 146 deletions test/integration/smoke/test_accounts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestAccounts,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -167,12 +162,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created accounts, domains etc
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestAccounts,self).tearDown()

@attr(
tags=[
Expand Down Expand Up @@ -352,12 +342,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestRemoveUserFromAccount,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -366,12 +351,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created instance, users etc
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestRemoveUserFromAccount,self).tearDown()

@attr(
tags=[
Expand Down Expand Up @@ -513,12 +493,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestNonRootAdminsPrivileges,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -527,12 +502,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created accounts
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestNonRootAdminsPrivileges,self).tearDown()

@attr(
tags=[
Expand Down Expand Up @@ -642,12 +612,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestServiceOfferingSiblings,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -656,12 +621,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created domains, accounts
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestServiceOfferingSiblings,self).tearDown()

@attr(
tags=[
Expand Down Expand Up @@ -766,12 +726,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestServiceOfferingHierarchy,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -780,12 +735,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created instance, volumes and snapshots
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestServiceOfferingHierarchy,self).tearDown()

@attr(
tags=[
Expand Down Expand Up @@ -908,12 +858,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestTemplateHierarchy,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -922,12 +867,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created instance, volumes and snapshots
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestTemplateHierarchy,self).tearDown()

@attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="true")
def test_01_template_hierarchy(self):
Expand Down Expand Up @@ -1064,12 +1004,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Clean up, terminate the created resources
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestAddVmToSubDomain,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -1078,12 +1013,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created resources
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestAddVmToSubDomain,self).tearDown()

@attr(
tags=[
Expand Down Expand Up @@ -1160,12 +1090,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestUserDetails,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -1174,12 +1099,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created network offerings
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestUserDetails,self).tearDown()

@attr(tags=[
"role",
Expand Down Expand Up @@ -1459,12 +1379,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestUserLogin,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -1473,12 +1388,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created network offerings
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestUserLogin,self).tearDown()

@attr(tags=["login", "accounts", "simulator", "advanced",
"advancedns", "basic", "eip", "sg"])
Expand Down Expand Up @@ -1716,12 +1626,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestUserAPIKeys,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -1730,12 +1635,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created network offerings
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestUserAPIKeys,self).tearDown()

@attr(tags=[
"role",
Expand Down Expand Up @@ -1868,13 +1768,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Clean up, terminate the created resources
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:

raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestDomainForceRemove,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand All @@ -1883,12 +1777,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created resources
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestDomainForceRemove,self).tearDown()

@attr(
tags=[
Expand Down Expand Up @@ -2247,13 +2136,7 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Clean up, terminate the created resources
cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:

raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestMoveUser,cls).tearDownClass()

def setUp(self):
self.apiclient = self.testClient.getApiClient()
Expand Down Expand Up @@ -2284,12 +2167,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created resources
cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestMoveUser,self).tearDownClass()

@attr(tags=["domains", "advanced", "advancedns", "simulator","dvs"], required_hardware="false")
def test_move_user_to_accountID(self):
Expand Down
Loading