From 1ccbc60a2d194c6f20b6cdd389802d33fcc7688e Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Tue, 18 Jun 2013 10:26:19 +0200 Subject: [PATCH] Instance bang now returns "OK" --- .../slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py | 4 ++-- master/bt5/slapos_slap_tool/bt/revision | 2 +- master/product/Vifib/Tool/SlapTool.py | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py b/master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py index 44d3fcdaca..1af3efc2ac 100644 --- a/master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py +++ b/master/bt5/slapos_slap_tool/TestTemplateItem/testSlapOSSlapTool.py @@ -1373,7 +1373,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): error_log = 'Please bang me' response = self.portal_slap.softwareInstanceBang(self.computer_id, partition_id, error_log) - self.assertEqual('None', response) + self.assertEqual('OK', response) created_at = rfc1123_date(DateTime()) response = self.portal_slap.getComputerPartitionStatus(self.computer_id, partition_id) @@ -2143,7 +2143,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): error_log = 'Please bang me' response = self.portal_slap.softwareInstanceBang(self.computer_id, partition_id, error_log) - self.assertEqual('None', response) + self.assertEqual('OK', response) created_at = rfc1123_date(DateTime()) response = self.portal_slap.getComputerPartitionStatus(self.computer_id, partition_id) diff --git a/master/bt5/slapos_slap_tool/bt/revision b/master/bt5/slapos_slap_tool/bt/revision index 8580e7b684..b74e882ae3 100644 --- a/master/bt5/slapos_slap_tool/bt/revision +++ b/master/bt5/slapos_slap_tool/bt/revision @@ -1 +1 @@ -30 \ No newline at end of file +31 \ No newline at end of file diff --git a/master/product/Vifib/Tool/SlapTool.py b/master/product/Vifib/Tool/SlapTool.py index 3994ba7ae5..1231bcb9e6 100644 --- a/master/product/Vifib/Tool/SlapTool.py +++ b/master/product/Vifib/Tool/SlapTool.py @@ -933,16 +933,15 @@ class SlapTool(BaseTool): '#error bang called') timestamp = str(int(software_instance.getModificationDate())) key = "%s_bangstamp" % software_instance.getReference() - result = "OK" transition = self.getPortalObject().portal_workflow.getInfoFor( software_instance, 'action', wf_id='instance_slap_interface_workflow') if (self._getLastData(key) != timestamp) and \ (transition != 'bang'): - result = software_instance.bang(bang_tree=True, comment=message) + software_instance.bang(bang_tree=True, comment=message) self._storeLastData(key, str(int(software_instance.getModificationDate()))) - return result + return "OK" def _getAccessStatus(self, context_reference): memcached_dict = self._getMemcachedDict() -- 2.30.9