X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Ffork%2Ftest_fork.py;fp=tests%2Fregression%2Fust%2Ffork%2Ftest_fork.py;h=3baa8cc389dc6aa88e4f21de8880b2ea324b19d2;hp=ec444aef71143128c72d91550be1cd76a3739e02;hb=b6e2447a0a8d7fcd62c9c592082f5543eb10ade4;hpb=2f16a8f9f5b5b37e103ba68c07f14c5beb8464e7 diff --git a/tests/regression/ust/fork/test_fork.py b/tests/regression/ust/fork/test_fork.py index ec444aef7..3baa8cc38 100644 --- a/tests/regression/ust/fork/test_fork.py +++ b/tests/regression/ust/fork/test_fork.py @@ -43,15 +43,7 @@ enable_ust_tracepoint_event(session_info, "ust_tests_fork*") start_session(session_info) fork_process = subprocess.Popen([test_path + "fork", test_path + "fork2"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - -if sys.version_info >= (3, 3): - try: - fork_process.wait(5) - except subprocess.TimeoutExpired: - fork_process.kill() - bail("Failed to run fork test application (time out)", session_info) -else: - fork_process.wait() +fork_process.wait() parent_pid = -1 child_pid = -1