Commit b62b0496 authored by Romain Courteaud's avatar Romain Courteaud

slapos_cloud: test: compatibility with _makeComplexComputeNode

parent db16231d
......@@ -489,7 +489,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
project_reference=project.getReference()
)
instance_tree.requestStart(**kw)
instance_tree.requestInstance(**kw)
with TemporaryAlarmScript(self.portal, 'Item_getSubscriptionStatus', "'subscribed'"):
instance_tree.requestInstance(**kw)
self.start_requested_software_instance = instance_tree.getSuccessorValue()
self.start_requested_software_instance.edit(aggregate=self.compute_node.partition1.getRelativeUrl())
......@@ -515,7 +516,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
project_reference=project.getReference()
)
instance_tree.requestStart(**slave_kw)
instance_tree.requestInstance(**slave_kw)
with TemporaryAlarmScript(self.portal, 'Item_getSubscriptionStatus', "'subscribed'"):
instance_tree.requestInstance(**slave_kw)
self.start_requested_slave_instance = instance_tree.getSuccessorValue()
self.start_requested_slave_instance.edit(aggregate=self.compute_node.partition1.getRelativeUrl())
......@@ -541,7 +543,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
project_reference=project.getReference()
)
instance_tree.requestStop(**kw)
instance_tree.requestInstance(**kw)
with TemporaryAlarmScript(self.portal, 'Item_getSubscriptionStatus', "'subscribed'"):
instance_tree.requestInstance(**kw)
self.stop_requested_software_instance = instance_tree.getSuccessorValue()
self.stop_requested_software_instance.edit(
......@@ -568,7 +571,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
project_reference=project.getReference()
)
instance_tree.requestStop(**kw)
instance_tree.requestInstance(**kw)
with TemporaryAlarmScript(self.portal, 'Item_getSubscriptionStatus', "'subscribed'"):
instance_tree.requestInstance(**kw)
kw['state'] = 'destroyed'
instance_tree.requestDestroy(**kw)
......@@ -599,7 +603,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
project_reference=project.getReference()
)
instance_tree.requestStop(**kw)
instance_tree.requestInstance(**kw)
with TemporaryAlarmScript(self.portal, 'Item_getSubscriptionStatus', "'subscribed'"):
instance_tree.requestInstance(**kw)
kw['state'] = 'destroyed'
instance_tree.requestDestroy(**kw)
......
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