From 2bab448502d05d0234b3796b1d1bfc5a5cf44c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 18 Jul 2013 16:02:26 -0400 Subject: [PATCH] Use the lttng_stop_tracing call instead of the lttng binary in the Python tests --- tests/regression/ust/fork/test_fork.py | 3 +++ tests/utils/test_utils.py | 12 +++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/regression/ust/fork/test_fork.py b/tests/regression/ust/fork/test_fork.py index 62faf71..9844ad7 100644 --- a/tests/regression/ust/fork/test_fork.py +++ b/tests/regression/ust/fork/test_fork.py @@ -89,6 +89,9 @@ print_test_result(babeltrace_process.returncode == 0, current_test, "Resulting t current_test += 1 if babeltrace_process.returncode != 0: + for error_line in babeltrace_process.stderr: + error_line = error_line.decode('utf-8').replace("\n", "") + print( "#" + error_line ) bail("Unreadable trace; can't proceed with analysis.", session_info) event_before_fork = False diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py index 4b38630..9e09181 100644 --- a/tests/utils/test_utils.py +++ b/tests/utils/test_utils.py @@ -21,6 +21,7 @@ import subprocess import shutil import sys import tempfile +import time # Import lttng bindings generated in the current tree lttng_bindings_path = os.path.dirname(os.path.abspath(__file__)) + "/" @@ -99,13 +100,6 @@ def start_session(session_info): start(session_info.name) def stop_session(session_info, bailing = False): - # Workaround lttng-ctl outputing directly to stdout by spawning a subprocess. - lttng_binary_path = os.path.dirname(os.path.abspath(__file__)) + "/" - for i in range(3): - lttng_binary_path = os.path.dirname(lttng_binary_path) - lttng_binary_path = lttng_binary_path + "/src/bin/lttng/lttng" - - retcode = subprocess.call([lttng_binary_path, "stop", session_info.name], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if retcode != 0 and not bailing: - bail("Unable to stop session " + session_info.name, session_info) + if stop(session_info.name) != 0: + print( "# Failed to close session " + session_info.name ) destroy(session_info.name) -- 1.8.3.3