X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fdaemon%2Ftest_daemon.py;h=d85f955216dfb686ed5b75b8600f045c3db2a567;hb=4881bba88a421d8e7f41d58feb88b4ca459af87d;hp=70afe3ce313f9635fd0d43cc89ec1d45f5ef2b17;hpb=848db431fe1e256852e5af0a9d9b20e0cf1ffd89;p=lttng-tools.git diff --git a/tests/regression/ust/daemon/test_daemon.py b/tests/regression/ust/daemon/test_daemon.py index 70afe3ce3..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 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()