Commit d89d412a authored by Alain Takoudjou's avatar Alain Takoudjou

slapos_crm: fix method name in alarm script

parent d538f2ec
...@@ -3,7 +3,7 @@ portal = context.getPortalObject() ...@@ -3,7 +3,7 @@ portal = context.getPortalObject()
portal.portal_catalog.searchAndActivate( portal.portal_catalog.searchAndActivate(
portal_type='Hosting Subscription', portal_type='Hosting Subscription',
validation_state='validated', validation_state='validated',
method_id='HostingSubscription_checkSofwareInstanceState', method_id='HostingSubscription_checkSoftwareInstanceState',
activate_kw = {'tag':tag} activate_kw = {'tag':tag}
) )
......
...@@ -1063,8 +1063,8 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(testSlapOSMixin): ...@@ -1063,8 +1063,8 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(testSlapOSMixin):
hosting_subscription.requestStart(**kw) hosting_subscription.requestStart(**kw)
hosting_subscription.requestInstance(**kw) hosting_subscription.requestInstance(**kw)
def _simulateHostingSubscription_checkSofwareInstanceState(self): def _simulateHostingSubscription_checkSoftwareInstanceState(self):
script_name = 'HostingSubscription_checkSofwareInstanceState' script_name = 'HostingSubscription_checkSoftwareInstanceState'
if script_name in self.portal.portal_skins.custom.objectIds(): if script_name in self.portal.portal_skins.custom.objectIds():
raise ValueError('Precondition failed: %s exists in custom' % script_name) raise ValueError('Precondition failed: %s exists in custom' % script_name)
createZODBPythonScript(self.portal.portal_skins.custom, createZODBPythonScript(self.portal.portal_skins.custom,
...@@ -1072,11 +1072,11 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(testSlapOSMixin): ...@@ -1072,11 +1072,11 @@ class TestSlapOSCrmMonitoringCheckInstanceInError(testSlapOSMixin):
'*args, **kw', '*args, **kw',
'# Script body\n' '# Script body\n'
"""portal_workflow = context.portal_workflow """portal_workflow = context.portal_workflow
portal_workflow.doActionFor(context, action='edit_action', comment='Visited by HostingSubscription_checkSofwareInstanceState') """ ) portal_workflow.doActionFor(context, action='edit_action', comment='Visited by HostingSubscription_checkSoftwareInstanceState') """ )
transaction.commit() transaction.commit()
def _dropHostingSubscription_checkSofwareInstanceState(self): def _dropHostingSubscription_checkSoftwareInstanceState(self):
script_name = 'HostingSubscription_checkSofwareInstanceState' script_name = 'HostingSubscription_checkSoftwareInstanceState'
if script_name in self.portal.portal_skins.custom.objectIds(): if script_name in self.portal.portal_skins.custom.objectIds():
self.portal.portal_skins.custom.manage_delObjects(script_name) self.portal.portal_skins.custom.manage_delObjects(script_name)
transaction.commit() transaction.commit()
...@@ -1084,30 +1084,30 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by H ...@@ -1084,30 +1084,30 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by H
def test_alarm_check_instance_in_error_validated_hosting_subscription(self): def test_alarm_check_instance_in_error_validated_hosting_subscription(self):
host_sub = self._makeHostingSubscription() host_sub = self._makeHostingSubscription()
self._simulateHostingSubscription_checkSofwareInstanceState() self._simulateHostingSubscription_checkSoftwareInstanceState()
try: try:
self.portal.portal_alarms.slapos_crm_check_instance_in_error.activeSense() self.portal.portal_alarms.slapos_crm_check_instance_in_error.activeSense()
self.tic() self.tic()
finally: finally:
self._dropHostingSubscription_checkSofwareInstanceState() self._dropHostingSubscription_checkSoftwareInstanceState()
self.assertEqual('Visited by HostingSubscription_checkSofwareInstanceState', self.assertEqual('Visited by HostingSubscription_checkSoftwareInstanceState',
host_sub.workflow_history['edit_workflow'][-1]['comment']) host_sub.workflow_history['edit_workflow'][-1]['comment'])
def test_alarm_check_instance_in_error_archived_hosting_subscription(self): def test_alarm_check_instance_in_error_archived_hosting_subscription(self):
host_sub = self._makeHostingSubscription() host_sub = self._makeHostingSubscription()
host_sub.archive() host_sub.archive()
self._simulateHostingSubscription_checkSofwareInstanceState() self._simulateHostingSubscription_checkSoftwareInstanceState()
try: try:
self.portal.portal_alarms.slapos_crm_check_instance_in_error.activeSense() self.portal.portal_alarms.slapos_crm_check_instance_in_error.activeSense()
self.tic() self.tic()
finally: finally:
self._dropHostingSubscription_checkSofwareInstanceState() self._dropHostingSubscription_checkSoftwareInstanceState()
self.assertNotEqual('Visited by HostingSubscription_checkSofwareInstanceState', self.assertNotEqual('Visited by HostingSubscription_checkSoftwareInstanceState',
host_sub.workflow_history['edit_workflow'][-1]['comment']) host_sub.workflow_history['edit_workflow'][-1]['comment'])
......
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