X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fexit-fast%2Ftest_exit-fast.py;h=4f498aed7ed669744f73838afab1c61c6cd34674;hb=c28fcefd993b7539716bb5cd9557a08a217ec463;hp=fbe3c857a69c89c5ce22748b1ac91ba20e6145fe;hpb=848db431fe1e256852e5af0a9d9b20e0cf1ffd89;p=lttng-tools.git diff --git a/tests/regression/ust/exit-fast/test_exit-fast.py b/tests/regression/ust/exit-fast/test_exit-fast.py index fbe3c857a..4f498aed7 100644 --- a/tests/regression/ust/exit-fast/test_exit-fast.py +++ b/tests/regression/ust/exit-fast/test_exit-fast.py @@ -47,30 +47,14 @@ start_session(session_info) test_env = os.environ.copy() test_env["LTTNG_UST_REGISTER_TIMEOUT"] = "-1" -exit_fast_process = subprocess.Popen(test_path + "exit-fast", stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=test_env) - -if sys.version_info >= (3, 3): - try: - exit_fast_process.wait(5) - except subprocess.TimeoutExpired: - exit_fast_process.kill() - bail("Failed to run exit-fast test application.") -else: - exit_fast_process.wait() +exit_fast_process = subprocess.Popen(test_path + "exit-fast", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, env=test_env) +exit_fast_process.wait() print_test_result(exit_fast_process.returncode == 0, current_test, "Test application exited normally") current_test += 1 -exit_fast_process = subprocess.Popen([test_path + "exit-fast", "suicide"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=test_env) - -if sys.version_info >= (3, 3): - try: - exit_fast_process.wait(5) - except subprocess.TimeoutExpired: - exit_fast_process.kill() - bail("Failed to run exit-fast test application in suicide mode.") -else: - exit_fast_process.wait() +exit_fast_process = subprocess.Popen([test_path + "exit-fast", "suicide"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, env=test_env) +exit_fast_process.wait() stop_session(session_info)