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
Alexander Emmerich
erp5
Commits
8cd0a55a
Commit
8cd0a55a
authored
Jun 12, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Up
parent
8bd1947a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
27 deletions
+6
-27
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+3
-2
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+3
-25
No files found.
erp5/util/testnode/ScalabilityTestRunner.py
View file @
8cd0a55a
...
...
@@ -37,11 +37,12 @@ import shutil
import
logging
import
string
import
random
import
testnodeUtils
from
ProcessManager
import
SubprocessError
,
ProcessManager
,
CancellationError
from
subprocess
import
CalledProcessError
from
Updater
import
Updater
from
erp5.util
import
taskdistribution
from
testnode
import
deunicodeData
class
ScalabilityTestRunner
():
...
...
@@ -104,7 +105,7 @@ class ScalabilityTestRunner():
print
"...isValidatedMaster(..):"
print
self
.
testnode
.
test_suite_portal
.
isValidatedMaster
(
self
.
testnode
.
config
[
'test_node_title'
])
test_configuration
=
deunicodeData
(
test_configuration
=
testnodeUtils
.
deunicodeData
(
json
.
loads
(
self
.
testnode
.
test_suite_portal
.
generateConfiguration
(
node_test_suite
.
test_suite_title
)))
...
...
erp5/util/testnode/testnode.py
View file @
8cd0a55a
...
...
@@ -37,6 +37,7 @@ import shutil
import
logging
import
string
import
random
import
testnodeUtils
from
ProcessManager
import
SubprocessError
,
ProcessManager
,
CancellationError
from
subprocess
import
CalledProcessError
from
Updater
import
Updater
...
...
@@ -45,6 +46,7 @@ from ScalabilityTestRunner import ScalabilityTestRunner
from
UnitTestRunner
import
UnitTestRunner
from
erp5.util
import
taskdistribution
DEFAULT_SLEEP_TIMEOUT
=
120
# time in seconds to sleep
MAX_LOG_TIME
=
15
# time in days we should keep logs that we can see through
# httd
...
...
@@ -59,30 +61,6 @@ class DummyLogger(object):
'critical'
,
'fatal'
):
setattr
(
self
,
name
,
func
)
def
deunicodeData
(
data
):
if
isinstance
(
data
,
int
):
new_data
=
data
elif
isinstance
(
data
,
str
):
new_data
=
data
elif
isinstance
(
data
,
list
):
new_data
=
[]
for
sub_data
in
data
:
new_data
.
append
(
deunicodeData
(
sub_data
))
elif
isinstance
(
data
,
unicode
):
new_data
=
data
.
encode
(
'utf8'
)
elif
isinstance
(
data
,
dict
):
new_data
=
{}
for
key
,
value
in
data
.
iteritems
():
key
=
deunicodeData
(
key
)
value
=
deunicodeData
(
value
)
new_data
[
key
]
=
value
else
:
new_data
=
data
return
new_data
class
TestNode
(
object
):
def
__init__
(
self
,
log
,
config
,
max_log_time
=
MAX_LOG_TIME
,
...
...
@@ -337,7 +315,7 @@ branch = %(branch)s
self
.
test_suite_portal
.
subscribeNode
(
config
[
'test_node_title'
],
config
[
'computer_id'
])
test_suite_json
=
self
.
test_suite_portal
.
startTestSuite
(
config
[
'test_node_title'
])
test_suite_data
=
deunicodeData
(
json
.
loads
(
test_suite_json
))
test_suite_data
=
testnodeUtils
.
deunicodeData
(
json
.
loads
(
test_suite_json
))
log
(
"Got following test suite data from master : %r"
%
\
(
test_suite_data
,))
##/BLOCK OK
...
...
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