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
Labels
Merge Requests
139
Merge Requests
139
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
14dda8ea
Commit
14dda8ea
authored
Apr 04, 2016
by
Sebastien Robin
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test_result: allow to define slapos parameters in test suites (part 2)
parent
cf657fc4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
product/ERP5/Document/ERP5ProjectUnitTestDistributor.py
product/ERP5/Document/ERP5ProjectUnitTestDistributor.py
+2
-2
No files found.
product/ERP5/Document/ERP5ProjectUnitTestDistributor.py
View file @
14dda8ea
...
...
@@ -385,9 +385,9 @@ class ERP5ProjectUnitTestDistributor(XMLObject):
test_suite
=
self
.
_getTestSuiteFromTitle
(
test_suite_title
)
cluster_configuration
=
test_suite
.
getClusterConfiguration
()
or
'{}'
try
:
generated_configuration
=
[
json
.
loads
(
cluster_configuration
)]
generated_configuration
=
{
"configuration_list"
:
[
json
.
loads
(
cluster_configuration
)]}
except
ValueError
:
generated_configuration
=
[{}]
generated_configuration
=
{
"configuration_list"
:
[{}]}
if
batch_mode
:
return
generated_configuration
return
json
.
dumps
(
generated_configuration
)
Sebastien Robin
@seb
mentioned in commit
d48f8bb7
·
Apr 04, 2016
mentioned in commit
d48f8bb7
mentioned in commit d48f8bb7a93fc3737dba8af113db14d7e23ca638
Toggle commit list
Jérome Perrin
@jerome
mentioned in merge request
!87 (merged)
·
Apr 04, 2016
mentioned in merge request
!87 (merged)
mentioned in merge request !87
Toggle commit list
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