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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tristan Cavelier
erp5
Commits
97a4d58d
Commit
97a4d58d
authored
Apr 10, 2017
by
Łukasz Nowak
Committed by
Tristan Cavelier
Apr 27, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CHERRY-PICKED Send process_timeout
Extend subscribeNode to send configuration provided by user.
parent
40115156
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
product/ERP5/Document/ERP5ProjectUnitTestDistributor.py
product/ERP5/Document/ERP5ProjectUnitTestDistributor.py
+6
-2
No files found.
product/ERP5/Document/ERP5ProjectUnitTestDistributor.py
View file @
97a4d58d
...
...
@@ -262,12 +262,15 @@ class ERP5ProjectUnitTestDistributor(XMLObject):
test_node_module
=
self
.
_getTestNodeModule
()
portal
=
self
.
getPortalObject
()
config
=
{}
tag
=
"%s_%s"
%
(
self
.
getRelativeUrl
(),
title
)
if
portal
.
portal_activities
.
countMessageWithTag
(
tag
)
==
0
:
test_node_list
=
test_node_module
.
searchFolder
(
portal_type
=
"Test Node"
,
title
=
SimpleQuery
(
comparison_operator
=
'='
,
title
=
title
),
)
if
getattr
(
self
,
'getProcessTimeout'
,
None
)
is
not
None
:
config
[
'process_timeout'
]
=
self
.
getProcessTimeout
()
assert
len
(
test_node_list
)
in
(
0
,
1
),
"Unable to find testnode : %s"
%
title
test_node
=
None
if
len
(
test_node_list
)
==
1
:
...
...
@@ -283,8 +286,9 @@ class ERP5ProjectUnitTestDistributor(XMLObject):
activate_kw
=
{
'tag'
:
tag
})
self
.
activate
(
after_tag
=
tag
).
optimizeConfiguration
()
test_node
.
setPingDate
()
return
test_node
return
None
if
batch_mode
:
return
config
return
json
.
dumps
(
config
)
def
_getSortedNodeTestSuiteToRun
(
self
,
test_node
):
"""
...
...
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