two examples of teardown from super

Author: DaanHoogland

test/integration/component/test_volumes.py

@@ -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()
@@ -1470,8 +1466,7 @@ def setUp(self):
         return
 
     def tearDown(self):
-        cleanup_resources(self.apiclient, self.cleanup)
-        return
+        super(TestMigrateVolume,self).tearDownClass()
 
     @attr(tags=["advanced", "sg", "advancedsg"], required_hardware='true')
     def test_01_migrateVolume(self):

test/integration/testpaths/testpath_storage_migration.py

@@ -324,7 +324,7 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         try:
-            cleanup_resources(cls.apiclient, cls._cleanup)
+            cleanup_resources(cls.apiclient, reversed(cls._cleanup))
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
 
@@ -335,13 +335,9 @@ def setUp(self):
         self.cleanup = []
 
     def tearDown(self):
-        try:
-            for storagePool in self.pools:
-                StoragePool.update(self.apiclient, id=storagePool.id, tags="")
-            cleanup_resources(self.apiclient, self.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        for storagePool in self.pools:
+            StoragePool.update(self.apiclient, id=storagePool.id, tags="")
+        super(TestStorageMigration,self).tearDown()
 
     @attr(tags=["advanced", "basic"], required_hardware="true")
     def test_01_migrate_root_and_data_disk_nonlive(self):