Commit 4fcc7247 authored by Romain Courteaud's avatar Romain Courteaud

slapos_cloud: stop using _simulateScript

parent 363b6523
...@@ -480,6 +480,7 @@ class TestSlapOSComputeNode_checkAndUpdateCapacityScope(SlapOSTestCaseMixin): ...@@ -480,6 +480,7 @@ class TestSlapOSComputeNode_checkAndUpdateCapacityScope(SlapOSTestCaseMixin):
self.assertEqual("Compute Node reported an error", self.assertEqual("Compute Node reported an error",
self.compute_node.workflow_history['edit_workflow'][-1]['comment']) self.compute_node.workflow_history['edit_workflow'][-1]['comment'])
<<<<<<< HEAD
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
self.compute_node = self.portal.compute_node_module.template_compute_node\ self.compute_node = self.portal.compute_node_module.template_compute_node\
...@@ -595,7 +596,7 @@ class TestSlapOSGarbageCollectStoppedRootTreeAlarm(SlapOSTestCaseMixin): ...@@ -595,7 +596,7 @@ class TestSlapOSGarbageCollectStoppedRootTreeAlarm(SlapOSTestCaseMixin):
self.assertEqual('start_requested', instance.getSlapState()) self.assertEqual('start_requested', instance.getSlapState())
def test_alarm(self): def test_alarm(self):
instance = self.createInstance() instance = self.createInstance(self.project)
self._test_alarm( self._test_alarm(
self.portal.portal_alarms.slapos_stop_collect_instance, self.portal.portal_alarms.slapos_stop_collect_instance,
instance, instance,
...@@ -829,7 +830,7 @@ class TestSlapOSGarbageCollectNonAllocatedRootTreeAlarm(SlapOSTestCaseMixin): ...@@ -829,7 +830,7 @@ class TestSlapOSGarbageCollectNonAllocatedRootTreeAlarm(SlapOSTestCaseMixin):
self.assertEqual('archived', instance_tree.getValidationState()) self.assertEqual('archived', instance_tree.getValidationState())
def test_alarm(self): def test_alarm(self):
instance = self.createInstance() instance = self.createInstance(self.project)
self._test_alarm( self._test_alarm(
self.portal.portal_alarms.slapos_garbage_collect_non_allocated_root_tree, self.portal.portal_alarms.slapos_garbage_collect_non_allocated_root_tree,
instance, instance,
......
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