projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: eliminate process timeouts from Python tests
[lttng-tools.git]
/
tests
/
regression
/
ust
/
daemon
/
test_daemon.py
diff --git
a/tests/regression/ust/daemon/test_daemon.py
b/tests/regression/ust/daemon/test_daemon.py
index 70afe3ce313f9635fd0d43cc89ec1d45f5ef2b17..d85f955216dfb686ed5b75b8600f045c3db2a567 100644
(file)
--- a/
tests/regression/ust/daemon/test_daemon.py
+++ b/
tests/regression/ust/daemon/test_daemon.py
@@
-44,14
+44,7
@@
enable_ust_tracepoint_event(session_info, "*")
start_session(session_info)
daemon_process = subprocess.Popen(test_path + "daemon", stdout=subprocess.PIPE)
start_session(session_info)
daemon_process = subprocess.Popen(test_path + "daemon", stdout=subprocess.PIPE)
-if sys.version_info >= (3, 3):
- try:
- daemon_process_return_code = daemon_process.wait(5)
- except subprocess.TimeoutExpired:
- daemon_process.kill()
- daemon_process_return_code = -1
-else:
- daemon_process_return_code = daemon_process.wait()
+daemon_process_return_code = daemon_process.wait()
daemon_process_output = daemon_process.communicate()[0]
daemon_process_output = daemon_process_output.decode('utf-8').splitlines()
daemon_process_output = daemon_process.communicate()[0]
daemon_process_output = daemon_process_output.decode('utf-8').splitlines()
This page took
0.026438 seconds
and
4
git commands to generate.