From 03eb5f7440d4c0b99390cb4369946aa5ec5b8651 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <fixed-term.christophe.bourquebedard@de.bosch.com>
Date: Mon, 24 Jun 2019 16:29:00 +0200
Subject: [PATCH] Use tracetools_launch instead of tracetools_trace in
 tracetools_test

---
 tracetools_test/package.xml              |  2 +-
 tracetools_test/tracetools_test/utils.py | 27 ++++++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/tracetools_test/package.xml b/tracetools_test/package.xml
index abb7cc7..39a65c8 100644
--- a/tracetools_test/package.xml
+++ b/tracetools_test/package.xml
@@ -26,7 +26,7 @@
   <test_depend>launch_ros</test_depend>
   <test_depend>python3-pytest</test_depend>
   <test_depend>tracetools</test_depend>
-  <test_depend>tracetools_trace</test_depend>
+  <test_depend>tracetools_launch</test_depend>
   <test_depend>tracetools_read</test_depend>
 
   <export>
diff --git a/tracetools_test/tracetools_test/utils.py b/tracetools_test/tracetools_test/utils.py
index c670820..a51023b 100644
--- a/tracetools_test/tracetools_test/utils.py
+++ b/tracetools_test/tracetools_test/utils.py
@@ -23,10 +23,10 @@ from typing import Tuple
 from launch import LaunchDescription
 from launch import LaunchService
 from launch_ros import get_default_launch_description
-import launch_ros.actions
+from launch_ros.actions import Node
+from tracetools_launch.trace import Trace
 from tracetools_read.utils import DictEvent
 from tracetools_read.utils import get_event_name
-from tracetools_trace.tools import lttng
 
 
 def run_and_trace(
@@ -51,24 +51,29 @@ def run_and_trace(
     session_name = f'{session_name_prefix}-{time.strftime("%Y%m%d%H%M%S")}'
     full_path = os.path.join(base_path, session_name)
 
-    lttng.lttng_init(session_name, full_path, ros_events=ros_events, kernel_events=kernel_events)
-
-    nodes = []
+    launch_actions = []
+    # Add trace action
+    launch_actions.append(Trace(
+        session_name=session_name,
+        base_path=base_path,
+        events_ust=ros_events,
+        events_kernel=kernel_events
+    ))
+    # Add nodes
     for node_name in node_names:
-        n = launch_ros.actions.Node(
+        n = Node(
             package=package_name,
             node_executable=node_name,
-            output='screen')
-        nodes.append(n)
-    ld = LaunchDescription(nodes)
+            output='screen',
+        )
+        launch_actions.append(n)
+    ld = LaunchDescription(launch_actions)
     ls = LaunchService()
     ls.include_launch_description(get_default_launch_description())
     ls.include_launch_description(ld)
 
     exit_code = ls.run()
 
-    lttng.lttng_fini(session_name)
-
     return exit_code, full_path