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
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
Eteri
erp5
Commits
46186b06
Commit
46186b06
authored
Jun 17, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Up, works fine
parent
a9c8f164
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
erp5/tests/testERP5TestNode.py
erp5/tests/testERP5TestNode.py
+2
-1
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+4
-5
No files found.
erp5/tests/testERP5TestNode.py
View file @
46186b06
...
...
@@ -69,6 +69,7 @@ class ERP5TestNode(TestCase):
config
[
"git_binary"
]
=
"git"
config
[
"slapos_directory"
]
=
self
.
slapos_directory
config
[
"working_directory"
]
=
self
.
working_directory
config
[
"software_directory"
]
=
self
.
software_directory
config
[
"node_quantity"
]
=
3
config
[
"test_suite_directory"
]
=
self
.
test_suite_directory
config
[
"environment"
]
=
self
.
environment
...
...
@@ -877,7 +878,7 @@ branch = foo
def
patch_generateConfiguration
(
self
,
*
args
,
**
kw
):
return
json
.
dumps
({
"configuration_list"
:
[{
"ok"
:
"ok"
}],
"involved_nodes_computer_guid"
\
:
[
"COMP1"
,
"COMP2"
,
"COMP3"
],
"error_message"
:
"No error."
,
"launcher_nodes_computer_guid"
:
[
"COMP1"
],
\
"launchable"
:
Fals
e
,
"randomized_path"
:
"azertyuiop"
})
"launchable"
:
Tru
e
,
"randomized_path"
:
"azertyuiop"
})
def
doNothing
(
self
,
*
args
,
**
kw
):
pass
def
patch_getSlaposAccountKey
(
self
,
*
args
,
**
kw
):
...
...
erp5/util/testnode/testnode.py
View file @
46186b06
...
...
@@ -404,11 +404,10 @@ from the distributor.")
node_test_suite
.
retry
=
True
continue
except
:
log
(
"Errror"
)
ex_type
,
ex
,
tb
=
sys
.
exc_info
()
traceback
.
print_tb
(
tb
)
log
(
"erp5testnode exception"
,
exc_info
=
sys
.
exc_info
())
raise
ex_type
,
ex
,
tb
=
sys
.
exc_info
()
traceback
.
print_tb
(
tb
)
log
(
"erp5testnode exception"
,
exc_info
=
sys
.
exc_info
())
raise
now
=
time
.
time
()
self
.
cleanUp
(
test_result
)
if
(
now
-
begin
)
<
120
:
...
...
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