Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Kirill Smelkov
neo
Commits
c0adf81c
Commit
c0adf81c
authored
Apr 12, 2017
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qa: fix occasional deadlock when starting subprocesses in functional tests
parent
01a01c8c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
neo/lib/logger.py
neo/lib/logger.py
+7
-0
neo/tests/functional/__init__.py
neo/tests/functional/__init__.py
+1
-3
No files found.
neo/lib/logger.py
View file @
c0adf81c
...
@@ -206,6 +206,13 @@ class NEOLogger(Logger):
...
@@ -206,6 +206,13 @@ class NEOLogger(Logger):
self
.
_setup
(
filename
,
reset
)
self
.
_setup
(
filename
,
reset
)
__del__
=
setup
__del__
=
setup
def
fork
(
self
):
with
self
:
pid
=
os
.
fork
()
if
pid
:
return
pid
self
.
_setup
()
def
isEnabledFor
(
self
,
level
):
def
isEnabledFor
(
self
,
level
):
return
True
return
True
...
...
neo/tests/functional/__init__.py
View file @
c0adf81c
...
@@ -158,7 +158,7 @@ class NEOProcess(object):
...
@@ -158,7 +158,7 @@ class NEOProcess(object):
if
args
:
if
args
:
os
.
close
(
w
)
os
.
close
(
w
)
os
.
kill
(
os
.
getpid
(),
signal
.
SIGSTOP
)
os
.
kill
(
os
.
getpid
(),
signal
.
SIGSTOP
)
self
.
pid
=
os
.
fork
()
self
.
pid
=
logging
.
fork
()
if
self
.
pid
:
if
self
.
pid
:
# Wait that the signal to kill the child is set up.
# Wait that the signal to kill the child is set up.
os
.
close
(
w
)
os
.
close
(
w
)
...
@@ -168,8 +168,6 @@ class NEOProcess(object):
...
@@ -168,8 +168,6 @@ class NEOProcess(object):
else
:
else
:
# Child
# Child
try
:
try
:
# release SQLite debug log
logging
.
setup
()
signal
.
signal
(
signal
.
SIGTERM
,
lambda
*
args
:
sys
.
exit
())
signal
.
signal
(
signal
.
SIGTERM
,
lambda
*
args
:
sys
.
exit
())
if
coverage
:
if
coverage
:
coverage
.
stop
()
coverage
.
stop
()
...
...
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