Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Frederic Thoma
erp5
Commits
4eb26017
Commit
4eb26017
authored
Dec 27, 2021
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Products.ERP5Type.tests: Follow-up on ActivityTool.tic signature change.
I did not identify this monkey-patch.
parent
041642d0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
product/ERP5Type/tests/ProcessingNodeTestCase.py
product/ERP5Type/tests/ProcessingNodeTestCase.py
+2
-2
No files found.
product/ERP5Type/tests/ProcessingNodeTestCase.py
View file @
4eb26017
...
@@ -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
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment