Commit 309d16c9 authored by Romain Courteaud's avatar Romain Courteaud

slapos_cloud: test: no need to manually call alarms

Interaction workflow will trigger them
parent b507004a
......@@ -292,8 +292,6 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
finally:
setSecurityManager(sm)
self.tic()
self.stepCallSlaposFreeComputePartitionAlarm()
self.tic()
free_partition_id_list = []
for partition in compute_node.contentValues(portal_type='Compute Partition'):
if partition.getReference() in destroyed_partition_id_list \
......@@ -371,6 +369,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
instance_title, software_release, software_type, server,
project_reference):
self.tic()
self.login(person_user_id)
self.personRequestInstanceNotReady(
software_release=software_release,
......@@ -380,7 +379,6 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
project_reference=project_reference
)
self.stepCallSlaposAllocateInstanceAlarm()
self.tic()
self.login(person_user_id)
......@@ -456,9 +454,6 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
self.assertEqual(408, status)
self.tic()
self.stepCallSlaposAllocateInstanceAlarm()
self.tic()
# now instantiate it on compute_node and set some nice connection dict
self.simulateSlapgridCP(server)
......@@ -501,7 +496,6 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
)
self.checkServiceSubscriptionRequest(instance_tree)
self.stepCallSlaposAllocateInstanceAlarm()
self.tic()
self.login(person_user_id)
......@@ -602,6 +596,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
partition_reference=instance_title,
project_reference=project_reference
)
self.tic()
# XXX search only for this user
instance_tree = self.portal.portal_catalog.getResultValue(
......@@ -610,8 +605,6 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin):
follow_up__reference=project_reference
)
self.checkServiceSubscriptionRequest(instance_tree)
self.stepCallSlaposAllocateInstanceAlarm()
self.tic()
self.login(person_user_id)
......
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