cleanup unconditionally

Author: DaanHoogland

Diff for: test/integration/smoke/test_hostha_kvm.py

@@ -79,6 +79,7 @@ def setUp(self):
             self.apiclient,
             self.services["service_offerings"]["hasmall"]
         )
+        self.cleanup = [self.service_offering]
 
         self.template = get_test_template(
             self.apiclient,
@@ -87,7 +88,6 @@ def setUp(self):
         )
 
         self.configureAndDisableHostHa()
-        self.cleanup = [self.service_offering]
 
     def updateConfiguration(self, name, value):
         cmd = updateConfiguration.updateConfigurationCmd()
@@ -116,9 +116,10 @@ def tearDown(self):
             self.dbclient.execute("delete from mshost where runid=%s" % self.getFakeMsRunId())
             self.dbclient.execute("delete from cluster_details where name='outOfBandManagementEnabled'")
             self.dbclient.execute("delete from data_center_details where name='outOfBandManagementEnabled'")
-            cleanup_resources(self.apiclient, self.cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
+        finally:
+            super(TestHAKVM, self).tearDown()
 
     def getHostHaEnableCmd(self):
         cmd = enableHAForHost.enableHAForHostCmd()
@@ -292,7 +293,6 @@ def test_hostha_enable_ha_when_host_in_maintenance(self):
         # Enable HA
         self.configureAndEnableHostHa()
 
-
         # Prepare for maintenance Host
         self.setHostToMaintanance(self.host.id)
 
@@ -341,7 +341,6 @@ def test_remove_ha_provider_not_possible(self):
         """
         self.logger.debug("Starting test_remove_ha_provider_not_possible")
 
-
         # Enable HA
         self.apiclient.configureHAForHost(self.getHostHaConfigCmd())
         cmd = self.getHostHaEnableCmd()
@@ -393,7 +392,6 @@ def test_hostha_kvm_host_degraded(self):
         self.startAgent()
         self.waitUntilHostInState("Available")
 
-
     @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true")
     def test_hostha_kvm_host_recovering(self):
         """
@@ -581,7 +579,6 @@ def getIpmiServerIp(self):
         return s.getsockname()[0]
 
     def get_non_configured_ha_host(self):
-
         response = list_hosts(
             self.apiclient,
             type='Routing'