X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fdaemon%2Ftest_daemon.py;h=d85f955216dfb686ed5b75b8600f045c3db2a567;hb=c8e23e94ccbc3d7a1327b5c17dbbbb782e57419f;hp=c9a9bff2c9a7207836106d33231648f202eaa205;hpb=43c28d504aa8ff65609f915a04e212fb923cfeba;p=lttng-tools.git diff --git a/tests/regression/ust/daemon/test_daemon.py b/tests/regression/ust/daemon/test_daemon.py index c9a9bff2c..d85f95521 100644 --- 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) -if sys.version_info >= (3, 3): - try: - daemon_process_return_code = daemon_process.wait(5) - except 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()