Extract spawn sessiond to utils function

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>

diff --git a/lttng_ivc/tests/ust_app_vs_ust_tools/test_ust_app_vs_ust_tools.py b/lttng_ivc/tests/ust_app_vs_ust_tools/test_ust_app_vs_ust_tools.py
index 17bac6ce7a2d836084f8fbdd7d4195445bed878c..7f00d51530909ea48a804b579cd18cbb8bd88d4e 100644 (file)
--- a/lttng_ivc/tests/ust_app_vs_ust_tools/test_ust_app_vs_ust_tools.py
+++ b/lttng_ivc/tests/ust_app_vs_ust_tools/test_ust_app_vs_ust_tools.py
@@ -118,11 +118,7 @@ def test_ust_app_tracing_available(tmpdir, ust_label, tools_label, should_trace)
         runtime_app.run("make V=1", cwd=app_path)
 
         # Start lttng-sessiond
-        # TODO: extract to utils function with a runtime as parameter
-        previous_handler = signal.signal(signal.SIGUSR1, lttng_sessiond_ready)
-        runtime_tools.spawn_subprocess("lttng-sessiond -vvv -S")
-        signal.sigtimedwait({signal.SIGUSR1}, 60)
-        previous_handler = signal.signal(signal.SIGUSR1, previous_handler)
+        utils.sessiond_spawn(runtime_tools)
 
         # Create session using mi to get path and session name
         runtime_tools.run('lttng create trace --output={}'.format(trace_path))

diff --git a/lttng_ivc/utils/utils.py b/lttng_ivc/utils/utils.py
index 20a424d987542f3be79595c1e417378cefbfe8cd..aedb1fdb3c0ae62a0dd68ee531d608fbfaff3fa2 100644 (file)
--- a/lttng_ivc/utils/utils.py
+++ b/lttng_ivc/utils/utils.py
@@ -1,6 +1,20 @@
+import signal
+
 def line_count(file_path):
     line_count = 0
     with open(file_path) as f:
         for line in f:
             line_count += 1
     return line_count
+
+
+def __dummy_sigusr1_handler():
+    pass
+
+
+def sessiond_spawn(runtime):
+        previous_handler = signal.signal(signal.SIGUSR1, __dummy_sigusr1_handler)
+        sessiond = runtime.spawn_subprocess("lttng-sessiond -vvv -S")
+        signal.sigtimedwait({signal.SIGUSR1}, 60)
+        previous_handler = signal.signal(signal.SIGUSR1, previous_handler)
+        return sessiond