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
Xavier Thompson
erp5
Commits
139448e5
Commit
139448e5
authored
Sep 06, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_test_result: ERP5ScalabilityDistributor: factorize startTestSuite
parent
24c177de
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
47 deletions
+8
-47
bt5/erp5_test_result/DocumentTemplateItem/ERP5ScalabilityDistributor.py
...result/DocumentTemplateItem/ERP5ScalabilityDistributor.py
+7
-46
bt5/erp5_test_result/bt/revision
bt5/erp5_test_result/bt/revision
+1
-1
No files found.
bt5/erp5_test_result/DocumentTemplateItem/ERP5ScalabilityDistributor.py
View file @
139448e5
...
...
@@ -91,7 +91,7 @@ class ERP5ScalabilityDistributor(ERP5ProjectUnitTestDistributor):
master_test_node_list
=
[
x
.
getObject
()
for
x
in
test_node_list
if
x
.
getMaster
()
==
True
]
# Get test suites and aggregate them to all valid testnode
test_suite_list
=
[
x
.
get
Title
()
for
x
in
test_suite_module
.
searchFolder
(
test_suite_list
=
[
x
.
get
RelativeUrl
()
for
x
in
test_suite_module
.
searchFolder
(
portal_type
=
"Scalability Test Suite"
,
validation_state
=
"validated"
,
specialise_uid
=
self
.
getUid
())]
for
test_node
in
test_node_list
:
...
...
@@ -155,7 +155,7 @@ class ERP5ScalabilityDistributor(ERP5ProjectUnitTestDistributor):
security
.
declarePublic
(
"startTestSuite"
)
def
startTestSuite
(
self
,
title
,
batch_mode
=
0
):
def
startTestSuite
(
self
,
title
,
batch_mode
=
0
,
computer_guid
=
'unknown'
):
"""
startTestSuite : subscribe node + return testsuite list to the master
"""
...
...
@@ -170,53 +170,14 @@ class ERP5ScalabilityDistributor(ERP5ProjectUnitTestDistributor):
master_test_node_title
=
[
x
.
getTitle
()
for
x
in
test_node_module
.
searchFolder
(
validatation_state
=
'validated'
)
if
(
x
.
getMaster
()
==
True
)
][
0
]
if
title
!=
master_test_node_title
:
if
title
==
master_test_node_title
:
return
super
(
ERP5ScalabilityDistributor
,
self
).
startTestSuite
(
title
=
title
,
batch_mode
=
batch_mode
,
computer_guid
=
computer_guid
)
else
:
if
batch_mode
:
return
[]
return
json
.
dumps
([])
if
test_node
!=
None
:
test_suite_list
=
test_node
.
getAggregateList
()
# We sort the list according to timestamp
choice_list
=
[]
if
len
(
test_suite_list
):
choice_list
=
[
x
.
getObject
()
for
x
in
test_suite_module
.
searchFolder
(
sort_on
=
[(
'indexation_timestamp'
,
'ascending'
)],
)
if
x
.
getTitle
()
in
test_suite_list
]
# XXX we should have first test suite with no test node working on
# them since a long time. However we do not have this information yet,
# so random sort is better for now.
choice_list
.
sort
(
key
=
lambda
x
:
random
.
random
())
for
test_suite
in
choice_list
:
config
=
{}
config
[
"project_title"
]
=
test_suite
.
getSourceProjectTitle
()
config
[
"test_suite"
]
=
test_suite
.
getTestSuite
()
config
[
"test_suite_title"
]
=
test_suite
.
getTitle
()
config
[
"additional_bt5_repository_id"
]
=
test_suite
.
getAdditionalBt5RepositoryId
()
config
[
"test_suite_reference"
]
=
test_suite
.
getReference
()
# config["cluster_configuration"] = test_suite.getClusterConfiguration()
# config["cluster_constraint"] = test_suite.getClusterConstraint()
#config["number_configuration"] = test_suite.getNumberConfiguration()
config
[
"number_configuration"
]
=
len
(
test_suite
.
getGraphCoordinate
())
vcs_repository_list
=
[]
#In this case objectValues is faster than searchFolder
for
repository
in
test_suite
.
objectValues
(
portal_type
=
"Test Suite Repository"
):
repository_dict
=
{}
for
property_name
in
[
"git_url"
,
"profile_path"
,
"buildout_section_id"
,
"branch"
]:
property_value
=
repository
.
getProperty
(
property_name
)
# the property name url returns the object's url, so it is mandatory use another name.
if
property_name
==
"git_url"
:
property_name
=
"url"
if
property_value
is
not
None
:
repository_dict
[
property_name
]
=
property_value
vcs_repository_list
.
append
(
repository_dict
)
config
[
"vcs_repository_list"
]
=
vcs_repository_list
to_delete_key_list
=
[
x
for
x
,
y
in
config
.
items
()
if
y
==
None
]
[
config
.
pop
(
x
)
for
x
in
to_delete_key_list
]
config_list
.
append
(
config
)
if
batch_mode
:
return
config_list
return
json
.
dumps
(
config_list
)
security
.
declarePublic
(
"generateConfiguration"
)
def
generateConfiguration
(
self
,
test_suite_title
,
batch_mode
=
0
):
...
...
bt5/erp5_test_result/bt/revision
View file @
139448e5
273
\ No newline at end of file
274
\ No newline at end of file
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