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
Laurent S
erp5
Commits
8bd808dc
Commit
8bd808dc
authored
Oct 24, 2012
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5testnode: fixed undefined variable and handle CalledProcessError
parent
9decb9ad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+3
-2
No files found.
erp5/util/testnode/testnode.py
View file @
8bd808dc
...
@@ -36,6 +36,7 @@ import time
...
@@ -36,6 +36,7 @@ import time
import
shutil
import
shutil
import
pkg_resources
import
pkg_resources
from
ProcessManager
import
SubprocessError
,
ProcessManager
,
CancellationError
from
ProcessManager
import
SubprocessError
,
ProcessManager
,
CancellationError
from
subprocess
import
CalledProcessError
from
Updater
import
Updater
from
Updater
import
Updater
from
erp5.util
import
taskdistribution
from
erp5.util
import
taskdistribution
...
@@ -284,7 +285,7 @@ branch = %(branch)s
...
@@ -284,7 +285,7 @@ branch = %(branch)s
process_manager
.
killPreviousRun
()
process_manager
.
killPreviousRun
()
if
test_result
is
not
None
:
if
test_result
is
not
None
:
try
:
try
:
test_result
.
removeWatch
(
log_file_name
)
test_result
.
removeWatch
(
self
.
config
[
'log_file'
]
)
except
KeyError
:
except
KeyError
:
log
(
"KeyError, Watcher already deleted or not added correctly"
)
log
(
"KeyError, Watcher already deleted or not added correctly"
)
...
@@ -357,7 +358,7 @@ branch = %(branch)s
...
@@ -357,7 +358,7 @@ branch = %(branch)s
time
.
sleep
(
20
)
time
.
sleep
(
20
)
self
.
runTestSuite
(
revision_dict
,
portal_url
)
self
.
runTestSuite
(
revision_dict
,
portal_url
)
test_result
.
removeWatch
(
log_file_name
)
test_result
.
removeWatch
(
log_file_name
)
except
SubprocessError
,
e
:
except
(
SubprocessError
,
CalledProcessError
)
as
e
:
log
(
"SubprocessError"
,
exc_info
=
sys
.
exc_info
())
log
(
"SubprocessError"
,
exc_info
=
sys
.
exc_info
())
if
test_result
is
not
None
:
if
test_result
is
not
None
:
test_result
.
removeWatch
(
log_file_name
)
test_result
.
removeWatch
(
log_file_name
)
...
...
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