X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Ftest_utils.py;h=ba9c2946e7654cea703f74cd43b23a872ec662b9;hb=4bd69c5f1161cd065f487da0f4c1aa03a73c47e4;hp=5e00de494a9cf0e24426d4adb7f1d4eabcc74a51;hpb=cfb007a4e21c5140fbad041cbea800770c35b805;p=lttng-tools.git

diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py
index 5e00de494..ba9c2946e 100644
--- a/tests/utils/test_utils.py
+++ b/tests/utils/test_utils.py
@@ -1,19 +1,9 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) - 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+# Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import uuid
 import os
@@ -32,6 +22,7 @@ sys.path.append(lttng_bindings_path)
 sys.path.append(lttng_bindings_libs_path)
 from lttng import *
 
+BABELTRACE_BIN="babeltrace2"
 
 class SessionInfo:
     def __init__(self, handle, session_name, tmp_directory, channel_name):
@@ -48,8 +39,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 +53,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
@@ -81,7 +75,7 @@ def create_session():
 
     res = create(session_name, trace_path)
     if res < 0:
-        bail("Failed to create tracing session.")
+        bail("Failed to create recording session.")
 
     channel = Channel()
     channel.name = "channel0"