X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flinking%2Ftest_linking.py;h=44940f74948aea0b4eefe37e99271f42ec251b77;hb=c996624c35518e5c90bcafbbfee5c9bcade1da49;hp=f2081f8073d30b59f10f2eeebe1ddad8c2116f31;hpb=848db431fe1e256852e5af0a9d9b20e0cf1ffd89;p=lttng-tools.git

diff --git a/tests/regression/ust/linking/test_linking.py b/tests/regression/ust/linking/test_linking.py
index f2081f807..44940f749 100644
--- a/tests/regression/ust/linking/test_linking.py
+++ b/tests/regression/ust/linking/test_linking.py
@@ -110,21 +110,15 @@ 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 subprocess.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,\
                           "Running application dynamically linked to providers, no preload")
     current_test += 1
-    print_test_result(not os.path.exists(session_info.trace_path), current_test,\
+    trace_path = os.path.join(session_info.trace_path, "ust", "uid")
+    print_test_result(not os.path.exists(trace_path), current_test,\
                           "No events logged when running demo application without preloading providers")
     current_test += 1
 
@@ -136,15 +130,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 subprocess.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)