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
Klaus Wölfel
erp5
Commits
624b3d1d
Commit
624b3d1d
authored
Nov 26, 2020
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
make testnode test less verbose
Don't log and fix a few resource warnings See merge request
!1307
parents
6c272cab
9c60d750
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
24 deletions
+23
-24
erp5/tests/testERP5TestNode.py
erp5/tests/testERP5TestNode.py
+0
-5
erp5/util/testnode/ProcessManager.py
erp5/util/testnode/ProcessManager.py
+22
-19
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+1
-0
No files found.
erp5/tests/testERP5TestNode.py
View file @
624b3d1d
...
@@ -38,9 +38,6 @@ def dummySuiteLog(_):
...
@@ -38,9 +38,6 @@ def dummySuiteLog(_):
class
ERP5TestNode
(
TestCase
):
class
ERP5TestNode
(
TestCase
):
_handler
=
logging
.
StreamHandler
(
sys
.
stdout
)
_handler
.
setFormatter
(
logging
.
Formatter
(
'TESTNODE LOG: %(message)s'
))
def
setUp
(
self
):
def
setUp
(
self
):
self
.
_temp_dir
=
tempfile
.
mkdtemp
()
self
.
_temp_dir
=
tempfile
.
mkdtemp
()
self
.
working_directory
=
os
.
path
.
join
(
self
.
_temp_dir
,
'testnode'
)
self
.
working_directory
=
os
.
path
.
join
(
self
.
_temp_dir
,
'testnode'
)
...
@@ -66,11 +63,9 @@ class ERP5TestNode(TestCase):
...
@@ -66,11 +63,9 @@ class ERP5TestNode(TestCase):
os
.
mkdir
(
self
.
remote_repository0
)
os
.
mkdir
(
self
.
remote_repository0
)
os
.
mkdir
(
self
.
remote_repository1
)
os
.
mkdir
(
self
.
remote_repository1
)
os
.
mkdir
(
self
.
remote_repository2
)
os
.
mkdir
(
self
.
remote_repository2
)
logging
.
getLogger
().
addHandler
(
self
.
_handler
)
def
tearDown
(
self
):
def
tearDown
(
self
):
shutil
.
rmtree
(
self
.
_temp_dir
,
True
)
shutil
.
rmtree
(
self
.
_temp_dir
,
True
)
logging
.
getLogger
().
removeHandler
(
self
.
_handler
)
def
getTestNode
(
self
):
def
getTestNode
(
self
):
config
=
{}
config
=
{}
...
...
erp5/util/testnode/ProcessManager.py
View file @
624b3d1d
...
@@ -136,8 +136,6 @@ def killCommand(pid):
...
@@ -136,8 +136,6 @@ def killCommand(pid):
class
ProcessManager
(
object
):
class
ProcessManager
(
object
):
stdin
=
open
(
os
.
devnull
)
def
__init__
(
self
,
max_timeout
=
MAX_TIMEOUT
):
def
__init__
(
self
,
max_timeout
=
MAX_TIMEOUT
):
self
.
process_pid_set
=
set
()
self
.
process_pid_set
=
set
()
signal
.
signal
(
signal
.
SIGTERM
,
self
.
sigterm_handler
)
signal
.
signal
(
signal
.
SIGTERM
,
self
.
sigterm_handler
)
...
@@ -176,23 +174,28 @@ class ProcessManager(object):
...
@@ -176,23 +174,28 @@ class ProcessManager(object):
logger
.
info
(
'subprocess_kw : %r'
,
subprocess_kw
)
logger
.
info
(
'subprocess_kw : %r'
,
subprocess_kw
)
logger
.
info
(
'$ %s'
,
command
)
logger
.
info
(
'$ %s'
,
command
)
sys
.
stdout
.
flush
()
sys
.
stdout
.
flush
()
p
=
subprocess
.
Popen
(
args
,
stdin
=
self
.
stdin
,
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
,
env
=
env
,
close_fds
=
True
,
with
open
(
os
.
devnull
)
as
stdin
:
**
subprocess_kw
)
p
=
subprocess
.
Popen
(
args
,
stdin
=
stdin
,
stdout
=
subprocess
.
PIPE
,
self
.
process_pid_set
.
add
(
p
.
pid
)
stderr
=
subprocess
.
PIPE
,
env
=
env
,
close_fds
=
True
,
timer
=
threading
.
Timer
(
self
.
max_timeout
,
timeoutExpired
,
args
=
(
p
,))
**
subprocess_kw
)
self
.
timer_set
.
add
(
timer
)
self
.
process_pid_set
.
add
(
p
.
pid
)
timer
.
start
()
timer
=
threading
.
Timer
(
self
.
max_timeout
,
timeoutExpired
,
args
=
(
p
,))
stdout
,
stderr
=
subprocess_capture
(
p
,
log_prefix
,
get_output
=
get_output
,
output_replacers
=
output_replacers
)
self
.
timer_set
.
add
(
timer
)
timer
.
cancel
()
timer
.
start
()
self
.
timer_set
.
discard
(
timer
)
stdout
,
stderr
=
subprocess_capture
(
p
,
log_prefix
,
get_output
=
get_output
,
output_replacers
=
output_replacers
)
result
=
dict
(
status_code
=
p
.
returncode
,
command
=
command
,
timer
.
cancel
()
stdout
=
stdout
,
stderr
=
stderr
)
self
.
timer_set
.
discard
(
timer
)
self
.
process_pid_set
.
discard
(
p
.
pid
)
result
=
dict
(
status_code
=
p
.
returncode
,
command
=
command
,
if
self
.
under_cancellation
:
stdout
=
stdout
,
stderr
=
stderr
)
raise
CancellationError
(
"Test Result was cancelled"
)
self
.
process_pid_set
.
discard
(
p
.
pid
)
if
raise_error_if_fail
and
p
.
returncode
:
p
.
stdout
.
close
()
raise
SubprocessError
(
result
)
p
.
stderr
.
close
()
if
self
.
under_cancellation
:
raise
CancellationError
(
"Test Result was cancelled"
)
if
raise_error_if_fail
and
p
.
returncode
:
raise
SubprocessError
(
result
)
return
result
return
result
def
getSupportedParameterList
(
self
,
program_path
):
def
getSupportedParameterList
(
self
,
program_path
):
...
...
erp5/util/testnode/testnode.py
View file @
624b3d1d
...
@@ -190,6 +190,7 @@ shared = true
...
@@ -190,6 +190,7 @@ shared = true
finally
:
finally
:
logger
.
propagate
=
True
logger
.
propagate
=
True
logger
.
removeHandler
(
handler
)
logger
.
removeHandler
(
handler
)
handler
.
close
()
def
checkRevision
(
self
,
test_result
,
node_test_suite
):
def
checkRevision
(
self
,
test_result
,
node_test_suite
):
if
node_test_suite
.
revision
==
test_result
.
revision
:
if
node_test_suite
.
revision
==
test_result
.
revision
:
...
...
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