slapos_cloud: tests: prevent test to impact other tests

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudAlarm.py

@@ -277,6 +277,7 @@ class TestSlapOSFreeComputePartitionAlarm(SlapOSTestCaseMixin):
 
     self.tic()
 
+    try:
       # Prevent calling interaction workflows
       software_instance.setCategoryList(
         software_instance.getCategoryList() + ['aggregate/%s' % partition.getRelativeUrl()]
@@ -294,6 +295,13 @@ class TestSlapOSFreeComputePartitionAlarm(SlapOSTestCaseMixin):
       self.assertEqual(None, software_instance.getAggregate())
       self.assertEqual('busy', partition.getSlapState())
       self.assertEqual(partition.getRelativeUrl(), software_instance2.getAggregate())
+    except:
+      # 2 instances linked to a partition crashes _fillComputeNodeInformationCache
+      # activity. Clean up to not impact the other tests
+      software_instance2.setAggregate(None)
+      raise
+    finally:
+      software_instance2.setAggregate(None)
 
   def test_SoftwareInstance_tryToUnallocatePartition_script_notDestroyed(self):
     instance_tree = self.addInstanceTree()