slapos_crm: update tests

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/Alarm_stopInstanceTreeFromRegularisationRequest.py

@@ -3,7 +3,7 @@ sub_tag = "RegularisationRequest_stopInstanceTreeList"
 portal.portal_catalog.searchAndActivate(
       portal_type="Regularisation Request",
       simulation_state=["suspended"],
-      default_resource_uid=[
+      resource__uid=[
         portal.service_module.slapos_crm_stop_acknowledgement.getUid(),
         portal.service_module.slapos_crm_delete_reminder.getUid(),
         portal.service_module.slapos_crm_delete_acknowledgement.getUid(),

master/bt5/slapos_crm/TestTemplateItem/portal_components/test.erp5.testSlapOSCRMAlarm.py

@@ -401,7 +401,10 @@ class TestSlapOSCrmStopInstanceTree(SlapOSTestCaseMixinWithAbort):
       reference="TESTREGREQ-%s" % new_id,
       )
 
-  def test_stopInstanceTree_matching_regularisation_request(self):
+  #################################################################
+  # slapos_crm_trigger_delete_reminder_escalation
+  #################################################################
+  def test_RegularisationRequest_stopInstanceTreeList_alarm_matchingRegularisationRequest(self):
     ticket = self.createRegularisationRequest()
     ticket.edit(resource='service_module/slapos_crm_delete_reminder')
     ticket.validate()
@@ -412,7 +415,7 @@ class TestSlapOSCrmStopInstanceTree(SlapOSTestCaseMixinWithAbort):
           slapos_crm_stop_instance_tree
     self._test_alarm(alarm, ticket, "RegularisationRequest_stopInstanceTreeList")
 
-  def test_stopInstanceTree_matching_regularisation_request_2(self):
+  def test_RegularisationRequest_stopInstanceTreeList_alarm_matchingRegularisationRequest2(self):
     ticket = self.createRegularisationRequest()
     ticket.edit(resource='service_module/slapos_crm_stop_acknowledgement')
     ticket.validate()
@@ -423,7 +426,7 @@ class TestSlapOSCrmStopInstanceTree(SlapOSTestCaseMixinWithAbort):
           slapos_crm_stop_instance_tree
     self._test_alarm(alarm, ticket, "RegularisationRequest_stopInstanceTreeList")
 
-  def test_stopInstanceTree_not_suspended(self):
+  def test_RegularisationRequest_stopInstanceTreeList_alarm_notSuspended(self):
     ticket = self.createRegularisationRequest()
     ticket.edit(resource='service_module/slapos_crm_stop_acknowledgement')
     ticket.validate()
@@ -433,8 +436,7 @@ class TestSlapOSCrmStopInstanceTree(SlapOSTestCaseMixinWithAbort):
           slapos_crm_stop_instance_tree
     self._test_alarm_not_visited(alarm, ticket, "RegularisationRequest_stopInstanceTreeList")
 
-
-  def test_stopInstanceTree_other_resource(self):
+  def test_RegularisationRequest_stopInstanceTreeList_alarm_otherResource(self):
     ticket = self.createRegularisationRequest()
     ticket.edit(resource='service_module/slapos_acknowledgement')
     ticket.validate()