X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flinking%2Ftest_linking.py;h=7400091e77fc03b3eaf506bb6356e90db36b798c;hb=5e7baece55566e74965d2246b1220de261a764b8;hp=9591312935894bdf2fc22b3932ab8fac01fb15e7;hpb=91c7528576191398299e36d4ac061b8a0076a643;p=lttng-tools.git diff --git a/tests/regression/ust/linking/test_linking.py b/tests/regression/ust/linking/test_linking.py index 959131293..7400091e7 100644 --- a/tests/regression/ust/linking/test_linking.py +++ b/tests/regression/ust/linking/test_linking.py @@ -110,15 +110,8 @@ if DYNAMIC_TEST_ENABLED: start_session(session_info) # Dry run, no events should be logged - demo_process = subprocess.Popen(test_path + "demo", stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if sys.version_info >= (3 ,3): - try: - demo_process.wait(5) - except TimeoutExpired: - demo_process.kill() - bail("Failed to run demo test application without preloading") - else: - demo_process.wait() + demo_process = subprocess.Popen(test_path + "demo", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + demo_process.wait() stop_session(session_info) print_test_result(demo_process.returncode == 0, current_test,\ @@ -136,15 +129,8 @@ for executable in test_executables: enable_ust_tracepoint_event(session_info, "ust_tests_demo*") start_session(session_info) - demo_process = subprocess.Popen(executable, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if sys.version_info >= (3, 3): - try: - demo_process.wait(5) - except TimeoutExpired: - demo_process.kill() - bail("Failed to run {0} test application".format(executable_name)) - else: - demo_process.wait() + demo_process = subprocess.Popen(executable, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + demo_process.wait() stop_session(session_info) trace_found = os.path.exists(session_info.trace_path)