slapos_pdm: fixup tests

master/bt5/slapos_pdm/TestTemplateItem/portal_components/test.erp5.testSlapOSPDMAlarm.py

@@ -28,7 +28,8 @@ class TestSlapOSUpgradeDecisionProcess(SlapOSTestCaseMixin):
 
   def test_alarm_upgrade_decision_process_instance_tree(self):
     upgrade_decision = self._makeUpgradeDecision()
-    upgrade_decision.start()
+    with TemporaryAlarmScript(self.portal, 'Base_reindexAndSenseAlarm', "'disabled'"):
+      upgrade_decision.start()
     self.tic()
 
     with TemporaryAlarmScript(self.portal, 'UpgradeDecision_processUpgrade'):

master/bt5/slapos_pdm/TestTemplateItem/portal_components/test.erp5.testSlapOSPDMSkins.py

@@ -34,7 +34,6 @@ class TestSlapOSPDMSkins(SlapOSTestCaseMixin):
 
     upgrade_decision = instance_tree.InstanceTree_createUpgradeDecision()
     upgrade_decision.start()
-
     self.portal.portal_workflow._jumpToStateFor(instance_tree,
                                                 'stop_requested')
 
@@ -43,7 +42,7 @@ class TestSlapOSPDMSkins(SlapOSTestCaseMixin):
     self.assertEqual(new_release_variation.getUrlString(),
                      instance_tree.getUrlString())
     self.assertEqual('stop_requested', instance_tree.getSlapState())
-    self.assertEqual('stopped', upgrade_decision.getSimulationState())
+    self.assertEqual('delivered', upgrade_decision.getSimulationState())
 
   def test_requestUpgrade_destroyed_instance_tree(self):
     software_product, _, type_variation, compute_node, _, instance_tree = self.bootstrapAllocableInstanceTree()