Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaohe Cao
slapos
Commits
18f655ea
Commit
18f655ea
authored
Jun 06, 2011
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5testnode'
parents
15ff0e11
866e9f1d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
slapos/recipe/erp5testnode/__init__.py
slapos/recipe/erp5testnode/__init__.py
+2
-1
slapos/recipe/erp5testnode/testnode.py
slapos/recipe/erp5testnode/testnode.py
+6
-4
No files found.
slapos/recipe/erp5testnode/__init__.py
View file @
18f655ea
...
@@ -87,8 +87,9 @@ class Recipe(BaseSlapRecipe):
...
@@ -87,8 +87,9 @@ class Recipe(BaseSlapRecipe):
node_quantity
=
self
.
parameter_dict
.
get
(
'node_quantity'
,
'1'
),
node_quantity
=
self
.
parameter_dict
.
get
(
'node_quantity'
,
'1'
),
test_suite_master_url
=
self
.
parameter_dict
.
get
(
test_suite_master_url
=
self
.
parameter_dict
.
get
(
'test_suite_master_url'
,
None
),
'test_suite_master_url'
,
None
),
test_suite
_name
=
self
.
parameter_dict
.
get
(
'test_suite_nam
e'
),
test_suite
=
self
.
parameter_dict
.
get
(
'test_suit
e'
),
test_suite_title
=
self
.
parameter_dict
.
get
(
'test_suite_title'
),
test_suite_title
=
self
.
parameter_dict
.
get
(
'test_suite_title'
),
test_node_title
=
self
.
parameter_dict
.
get
(
'test_node_title'
),
project_title
=
self
.
parameter_dict
.
get
(
'project_title'
),
project_title
=
self
.
parameter_dict
.
get
(
'project_title'
),
bin_directory
=
self
.
bin_directory
,
bin_directory
=
self
.
bin_directory
,
# botenvironemnt is splittable string of key=value to substitute
# botenvironemnt is splittable string of key=value to substitute
...
...
slapos/recipe/erp5testnode/testnode.py
View file @
18f655ea
...
@@ -101,6 +101,7 @@ branch = %(branch)s
...
@@ -101,6 +101,7 @@ branch = %(branch)s
custom_profile
.
close
()
custom_profile
.
close
()
config
[
'repository_path'
]
=
repository_path
config
[
'repository_path'
]
=
repository_path
sys
.
path
.
append
(
repository_path
)
sys
.
path
.
append
(
repository_path
)
test_suite_title
=
config
[
'test_suite_title'
]
or
config
[
'test_suite'
]
retry_software
=
False
retry_software
=
False
try
:
try
:
...
@@ -151,8 +152,9 @@ branch = %(branch)s
...
@@ -151,8 +152,9 @@ branch = %(branch)s
master
=
portal
.
portal_task_distribution
master
=
portal
.
portal_task_distribution
assert
master
.
getProtocolRevision
()
==
1
assert
master
.
getProtocolRevision
()
==
1
test_result
=
safeRpcCall
(
master
.
createTestResult
,
test_result
=
safeRpcCall
(
master
.
createTestResult
,
config
[
'test_suite_name'
],
revision
,
[],
config
[
'test_suite'
],
revision
,
[],
False
,
config
[
'test_suite_title'
],
config
[
'project_title'
])
False
,
test_suite_title
,
config
[
'test_node_title'
],
config
[
'project_title'
])
print
"testnode, test_result : %r"
%
(
test_result
,)
print
"testnode, test_result : %r"
%
(
test_result
,)
if
test_result
:
if
test_result
:
test_result_path
,
test_revision
=
test_result
test_result_path
,
test_revision
=
test_result
...
@@ -176,7 +178,7 @@ branch = %(branch)s
...
@@ -176,7 +178,7 @@ branch = %(branch)s
)
)
if
status_dict
[
'status_code'
]
!=
0
:
if
status_dict
[
'status_code'
]
!=
0
:
safeRpcCall
(
master
.
reportTaskFailure
,
safeRpcCall
(
master
.
reportTaskFailure
,
test_result_path
,
status_dict
,
config
[
'test_
suit
e_title'
])
test_result_path
,
status_dict
,
config
[
'test_
nod
e_title'
])
retry_software
=
True
retry_software
=
True
continue
continue
...
@@ -220,7 +222,7 @@ branch = %(branch)s
...
@@ -220,7 +222,7 @@ branch = %(branch)s
if
line
[:
2
]
==
'#!'
:
if
line
[:
2
]
==
'#!'
:
invocation_list
=
line
[
2
:].
split
()
invocation_list
=
line
[
2
:].
split
()
invocation_list
.
extend
([
run_test_suite_path
,
invocation_list
.
extend
([
run_test_suite_path
,
'--test_suite'
,
config
[
'test_suite
_name
'
],
'--test_suite'
,
config
[
'test_suite'
],
'--revision'
,
revision
,
'--revision'
,
revision
,
'--node_quantity'
,
config
[
'node_quantity'
],
'--node_quantity'
,
config
[
'node_quantity'
],
'--master_url'
,
config
[
'test_suite_master_url'
]])
'--master_url'
,
config
[
'test_suite_master_url'
]])
...
...
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