Commit 84a9a4d2 authored by Romain Courteaud's avatar Romain Courteaud

slapos_pdm: fixup tests

parent ed7a07f7
...@@ -28,6 +28,7 @@ class TestSlapOSUpgradeDecisionProcess(SlapOSTestCaseMixin): ...@@ -28,6 +28,7 @@ class TestSlapOSUpgradeDecisionProcess(SlapOSTestCaseMixin):
def test_alarm_upgrade_decision_process_instance_tree(self): def test_alarm_upgrade_decision_process_instance_tree(self):
upgrade_decision = self._makeUpgradeDecision() upgrade_decision = self._makeUpgradeDecision()
with TemporaryAlarmScript(self.portal, 'Base_reindexAndSenseAlarm', "'disabled'"):
upgrade_decision.start() upgrade_decision.start()
self.tic() self.tic()
......
...@@ -34,7 +34,6 @@ class TestSlapOSPDMSkins(SlapOSTestCaseMixin): ...@@ -34,7 +34,6 @@ class TestSlapOSPDMSkins(SlapOSTestCaseMixin):
upgrade_decision = instance_tree.InstanceTree_createUpgradeDecision() upgrade_decision = instance_tree.InstanceTree_createUpgradeDecision()
upgrade_decision.start() upgrade_decision.start()
self.portal.portal_workflow._jumpToStateFor(instance_tree, self.portal.portal_workflow._jumpToStateFor(instance_tree,
'stop_requested') 'stop_requested')
...@@ -43,7 +42,7 @@ class TestSlapOSPDMSkins(SlapOSTestCaseMixin): ...@@ -43,7 +42,7 @@ class TestSlapOSPDMSkins(SlapOSTestCaseMixin):
self.assertEqual(new_release_variation.getUrlString(), self.assertEqual(new_release_variation.getUrlString(),
instance_tree.getUrlString()) instance_tree.getUrlString())
self.assertEqual('stop_requested', instance_tree.getSlapState()) 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): def test_requestUpgrade_destroyed_instance_tree(self):
software_product, _, type_variation, compute_node, _, instance_tree = self.bootstrapAllocableInstanceTree() software_product, _, type_variation, compute_node, _, instance_tree = self.bootstrapAllocableInstanceTree()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment