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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
erp5
Commits
c6288537
Commit
c6288537
authored
Aug 03, 2016
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5.util.testnode: slapos use it's own ConnectionError
parent
f7319ec9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+3
-3
No files found.
erp5/util/testnode/testnode.py
View file @
c6288537
...
@@ -32,7 +32,7 @@ import time
...
@@ -32,7 +32,7 @@ import time
import
shutil
import
shutil
import
logging
import
logging
import
Utils
import
Utils
from
requests.exceptions
import
RequestException
from
slapos.slap.slap
import
ConnectionError
import
traceback
import
traceback
...
@@ -437,8 +437,8 @@ from the distributor.")
...
@@ -437,8 +437,8 @@ from the distributor.")
# break the loop to get latest priorities from master
# break the loop to get latest priorities from master
break
break
self
.
cleanUp
(
test_result
)
self
.
cleanUp
(
test_result
)
except
(
SubprocessError
,
CalledProcessError
,
RequestException
)
as
e
:
except
(
SubprocessError
,
CalledProcessError
,
ConnectionError
)
as
e
:
log
(
"SubprocessError or
RequestException
: %r"
%
(
e
,),
exc_info
=
sys
.
exc_info
())
log
(
"SubprocessError or
ConnectionError
: %r"
%
(
e
,),
exc_info
=
sys
.
exc_info
())
if
remote_test_result_needs_cleanup
:
if
remote_test_result_needs_cleanup
:
status_dict
=
e
.
status_dict
or
{}
status_dict
=
e
.
status_dict
or
{}
test_result
.
reportFailure
(
test_result
.
reportFailure
(
...
...
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