Fix: track-untrack.c: regression of `--all --pid` option ordering

[lttng-tools.git] / tests / utils / test_utils.py

diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py
index 5e00de494a9cf0e24426d4adb7f1d4eabcc74a51..02e632a26289fa24e7246abdbae481cf3b17c617 100644 (file)
--- a/tests/utils/test_utils.py
+++ b/tests/utils/test_utils.py
@@ -48,8 +48,8 @@ def bail(diag, session_info = None):
     if session_info is not None:
         stop_session(session_info, True)
 
-        if os.path.exists(session_info.trace_path):
-            shutil.rmtree(session_info.trace_path)
+        if os.path.exists(session_info.tmp_directory):
+            shutil.rmtree(session_info.tmp_directory)
     exit(-1)
 
 def print_test_result(result, number, description):
@@ -62,6 +62,9 @@ def print_test_result(result, number, description):
     result_string += " {0} - {1}".format(number, description)
     print(result_string)
 
+def skip_test(number, description):
+    print('ok {} # skip {}'.format(number, description))
+
 def enable_ust_tracepoint_event(session_info, event_name):
     event = Event()
     event.name = event_name