Commit 4eb26017 authored by Vincent Pelletier's avatar Vincent Pelletier

Products.ERP5Type.tests: Follow-up on ActivityTool.tic signature change.

I did not identify this monkey-patch.
parent 041642d0
...@@ -84,7 +84,7 @@ def patchActivityTool(): ...@@ -84,7 +84,7 @@ def patchActivityTool():
# When there is more than 1 node, prevent the distributing node from # When there is more than 1 node, prevent the distributing node from
# processing activities. # processing activities.
@patch @patch
def tic(self, processing_node=1, force=0): def tic(self, processing_node=1, force=0, can_loop=True):
processing_node_list = self.getProcessingNodeList() processing_node_list = self.getProcessingNodeList()
if len(processing_node_list) > 1 and \ if len(processing_node_list) > 1 and \
getCurrentNode() == self.getDistributingNode(): getCurrentNode() == self.getDistributingNode():
...@@ -93,7 +93,7 @@ def patchActivityTool(): ...@@ -93,7 +93,7 @@ def patchActivityTool():
transaction.commit() transaction.commit()
transaction.begin() transaction.begin()
else: else:
self._orig_tic(processing_node, force) self._orig_tic(processing_node, force, can_loop=can_loop)
def Application_resolveConflict(self, old_state, saved_state, new_state): def Application_resolveConflict(self, old_state, saved_state, new_state):
......
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