diff --git a/tracetools_test/test/test_publisher.py b/tracetools_test/test/test_publisher.py index f1adab4..0c15283 100644 --- a/tracetools_test/test/test_publisher.py +++ b/tracetools_test/test/test_publisher.py @@ -18,7 +18,7 @@ class TestPublisher(unittest.TestCase): base_path = '/tmp' test_node = 'test_publisher' - exit_code, full_path = run_and_trace(session_name_prefix, base_path, publisher_creation_events, None, PKG, test_node) + exit_code, full_path = run_and_trace(base_path, session_name_prefix, publisher_creation_events, None, PKG, test_node) self.assertEqual(exit_code, 0) trace_events = get_trace_event_names(full_path) diff --git a/tracetools_test/test/test_subscription.py b/tracetools_test/test/test_subscription.py index f5543cd..5caac19 100644 --- a/tracetools_test/test/test_subscription.py +++ b/tracetools_test/test/test_subscription.py @@ -19,7 +19,7 @@ class TestSubscription(unittest.TestCase): base_path = '/tmp' test_node = 'test_subscription' - exit_code, full_path = run_and_trace(session_name_prefix, base_path, subscription_creation_events, None, PKG, test_node) + exit_code, full_path = run_and_trace(base_path, session_name_prefix, subscription_creation_events, None, PKG, test_node) self.assertEqual(exit_code, 0) trace_events = get_trace_event_names(full_path) diff --git a/tracetools_test/tracetools_test/utils.py b/tracetools_test/tracetools_test/utils.py index 8fc6b27..823b946 100644 --- a/tracetools_test/tracetools_test/utils.py +++ b/tracetools_test/tracetools_test/utils.py @@ -15,7 +15,7 @@ from tracetools_trace.tools.lttng import ( lttng_destroy, ) -def run_and_trace(session_name_prefix, base_path, ros_events, kernel_events, package_name, node_executable): +def run_and_trace(base_path, session_name_prefix, ros_events, kernel_events, package_name, node_executable): session_name = f'{session_name_prefix}-{time.strftime("%Y%m%d%H%M%S")}' full_path = f'{base_path}/{session_name}' print(f'trace directory: {full_path}')