Commit 48e2f8f0 authored by Romain Courteaud's avatar Romain Courteaud

slapos_cloud: test: compatibility with _makeComplexComputeNode

parent 89c66b8b
...@@ -497,7 +497,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -497,7 +497,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
project_reference=project.getReference() project_reference=project.getReference()
) )
instance_tree.requestStart(**kw) 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 = instance_tree.getSuccessorValue()
self.start_requested_software_instance.edit(aggregate=self.compute_node.partition1.getRelativeUrl()) self.start_requested_software_instance.edit(aggregate=self.compute_node.partition1.getRelativeUrl())
...@@ -523,7 +524,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -523,7 +524,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
project_reference=project.getReference() project_reference=project.getReference()
) )
instance_tree.requestStart(**slave_kw) 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 = instance_tree.getSuccessorValue()
self.start_requested_slave_instance.edit(aggregate=self.compute_node.partition1.getRelativeUrl()) self.start_requested_slave_instance.edit(aggregate=self.compute_node.partition1.getRelativeUrl())
...@@ -549,7 +551,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -549,7 +551,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
project_reference=project.getReference() project_reference=project.getReference()
) )
instance_tree.requestStop(**kw) 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 = instance_tree.getSuccessorValue()
self.stop_requested_software_instance.edit( self.stop_requested_software_instance.edit(
...@@ -576,7 +579,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -576,7 +579,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
project_reference=project.getReference() project_reference=project.getReference()
) )
instance_tree.requestStop(**kw) instance_tree.requestStop(**kw)
instance_tree.requestInstance(**kw) with TemporaryAlarmScript(self.portal, 'Item_getSubscriptionStatus', "'subscribed'"):
instance_tree.requestInstance(**kw)
kw['state'] = 'destroyed' kw['state'] = 'destroyed'
instance_tree.requestDestroy(**kw) instance_tree.requestDestroy(**kw)
...@@ -607,7 +611,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin): ...@@ -607,7 +611,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
project_reference=project.getReference() project_reference=project.getReference()
) )
instance_tree.requestStop(**kw) instance_tree.requestStop(**kw)
instance_tree.requestInstance(**kw) with TemporaryAlarmScript(self.portal, 'Item_getSubscriptionStatus', "'subscribed'"):
instance_tree.requestInstance(**kw)
kw['state'] = 'destroyed' kw['state'] = 'destroyed'
instance_tree.requestDestroy(**kw) 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