slapos_cloud: tests: prevent test to impact other tests

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

@@ -277,23 +277,31 @@ class TestSlapOSFreeComputePartitionAlarm(SlapOSTestCaseMixin):
 
     self.tic()
 
-    # Prevent calling interaction workflows
-    software_instance.setCategoryList(
-      software_instance.getCategoryList() + ['aggregate/%s' % partition.getRelativeUrl()]
+    try:
+      # Prevent calling interaction workflows
+      software_instance.setCategoryList(
+        software_instance.getCategoryList() + ['aggregate/%s' % partition.getRelativeUrl()]
+        )
+      software_instance2.setCategoryList(
+        software_instance2.getCategoryList() + ['aggregate/%s' % partition.getRelativeUrl()]
       )
-    software_instance2.setCategoryList(
-      software_instance2.getCategoryList() + ['aggregate/%s' % partition.getRelativeUrl()]
-    )
-    self.portal.portal_workflow._jumpToStateFor(partition,
-        'busy')
-    self.portal.portal_workflow._jumpToStateFor(software_instance,
-        'destroy_requested')
-    self.tic()
-
-    software_instance.SoftwareInstance_tryToUnallocatePartition()
-    self.assertEqual(None, software_instance.getAggregate())
-    self.assertEqual('busy', partition.getSlapState())
-    self.assertEqual(partition.getRelativeUrl(), software_instance2.getAggregate())
+      self.portal.portal_workflow._jumpToStateFor(partition,
+          'busy')
+      self.portal.portal_workflow._jumpToStateFor(software_instance,
+          'destroy_requested')
+      self.tic()
+
+      software_instance.SoftwareInstance_tryToUnallocatePartition()
+      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()