X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Ffork%2Ftest_fork.py;h=7288bcc371c559654f61439a0ea5c4650c8a6718;hb=86546faf995a02dce38601cdcd7785669aafb540;hp=62faf71f1ad121ded11c65e321f269a2a59492a5;hpb=37bd6c8e4c4a3d7054d97627e4fb4bef1d4612a6;p=lttng-tools.git diff --git a/tests/regression/ust/fork/test_fork.py b/tests/regression/ust/fork/test_fork.py index 62faf71f1..7288bcc37 100644 --- a/tests/regression/ust/fork/test_fork.py +++ b/tests/regression/ust/fork/test_fork.py @@ -43,16 +43,6 @@ 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 TimeoutExpired: - fork_process.kill() - bail("Failed to run fork test application (time out)", session_info) -else: - fork_process.wait() - parent_pid = -1 child_pid = -1 for line in fork_process.stdout: @@ -64,6 +54,8 @@ for line in fork_process.stdout: if match: parent_pid = match.group(1) +fork_process.wait() + print_test_result(fork_process.returncode == 0, current_test, "Fork test application exited normally") current_test += 1