X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flinking%2Ftest_linking.py;fp=tests%2Fregression%2Fust%2Flinking%2Ftest_linking.py;h=29128aa29d047266422dac520f4123393a5a519b;hp=f2081f8073d30b59f10f2eeebe1ddad8c2116f31;hb=b6e2447a0a8d7fcd62c9c592082f5543eb10ade4;hpb=2f16a8f9f5b5b37e103ba68c07f14c5beb8464e7 diff --git a/tests/regression/ust/linking/test_linking.py b/tests/regression/ust/linking/test_linking.py index f2081f807..29128aa29 100644 --- a/tests/regression/ust/linking/test_linking.py +++ b/tests/regression/ust/linking/test_linking.py @@ -111,14 +111,7 @@ if DYNAMIC_TEST_ENABLED: # 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 subprocess.TimeoutExpired: - demo_process.kill() - bail("Failed to run demo test application without preloading") - else: - demo_process.wait() + demo_process.wait() stop_session(session_info) print_test_result(demo_process.returncode == 0, current_test,\ @@ -137,14 +130,7 @@ for executable in test_executables: 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 subprocess.TimeoutExpired: - demo_process.kill() - bail("Failed to run {0} test application".format(executable_name)) - else: - demo_process.wait() + demo_process.wait() stop_session(session_info) trace_found = os.path.exists(session_info.trace_path)