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
amrani
erp5
Commits
9839c04d
Commit
9839c04d
authored
Sep 04, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
taskdistribution: rename getNextTest into getRunningTest
parent
2931595a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
11 deletions
+8
-11
erp5/util/scalability/runScalabilityTestSuite.py
erp5/util/scalability/runScalabilityTestSuite.py
+6
-9
erp5/util/taskdistribution/__init__.py
erp5/util/taskdistribution/__init__.py
+2
-2
No files found.
erp5/util/scalability/runScalabilityTestSuite.py
View file @
9839c04d
...
...
@@ -260,19 +260,16 @@ class ScalabilityLauncher(object):
for
file_to_move
in
file_to_move_list
:
shutil
.
move
(
file_to_move
,
new_directory_path
)
def
get
Next
Test
(
self
):
def
get
Running
Test
(
self
):
"""
Return a ScalabilityTest with current running test case informations,
or None if no test_case ready
"""
data
=
self
.
test_result
.
get
Next
TestCase
()
if
data
==
None
:
data
=
self
.
test_result
.
get
Running
TestCase
()
if
not
data
:
return
None
decoded_data
=
Utils
.
deunicodeData
(
json
.
loads
(
data
))
next_test
=
ScalabilityTest
(
decoded_data
,
self
.
test_result
)
return
next_test
decoded_data
=
Utils
.
deunicodeData
(
json
.
loads
(
data
))
return
ScalabilityTest
(
decoded_data
,
self
.
test_result
)
def
run
(
self
):
self
.
log
(
"Scalability Launcher started, with:"
)
...
...
@@ -292,7 +289,7 @@ class ScalabilityLauncher(object):
# Main loop
while
True
:
current_test
=
self
.
get
Next
Test
()
current_test
=
self
.
get
Running
Test
()
if
current_test
==
None
:
self
.
log
(
"No Test Case Ready"
)
else
:
...
...
erp5/util/taskdistribution/__init__.py
View file @
9839c04d
...
...
@@ -410,12 +410,12 @@ class TestResultProxyProxy(TestResultProxy):
TestResultProxy
.
__init__
(
self
,
proxy
,
retry_time
,
logger
,
test_result_path
,
node_title
,
revision
)
def
get
Next
TestCase
(
self
):
def
get
Running
TestCase
(
self
):
"""
A proxy to getNextTestCase
Return the relative path of the test with the running state
"""
return
self
.
_retryRPC
(
'get
Next
TestCase'
,
[
self
.
_test_result_path
])
return
self
.
_retryRPC
(
'get
Running
TestCase'
,
[
self
.
_test_result_path
])
def
cancelTestCase
(
self
,
test_result_line_path
):
"""
...
...
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