Always issues lttng stop before destroy

lttng-tools 2.7 did not perform a stop on destroy.

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

diff --git a/lttng_ivc/tests/babeltrace/base/test_babeltrace_base.py b/lttng_ivc/tests/babeltrace/base/test_babeltrace_base.py
index 8cc0031c315e634bb49d2d86efc3952734dbc6d7..f9534d51110f425565dc0cd21b27c4ca5aa4320d 100644 (file)
--- a/lttng_ivc/tests/babeltrace/base/test_babeltrace_base.py
+++ b/lttng_ivc/tests/babeltrace/base/test_babeltrace_base.py
@@ -147,6 +147,7 @@ def test_babeltrace_base_ust(tmpdir, babeltrace_l, tools_l):
         runtime.run(cmd, cwd=app_path)
 
         # Stop tracing
+        runtime.run('lttng stop')
         runtime.run('lttng destroy -a')
         cp = runtime.subprocess_terminate(sessiond)
         if cp.returncode != 0:
@@ -274,6 +275,7 @@ def test_babeltrace_same_trace_ust(tmpdir, babeltrace_list, tools_l):
         runtime.run(cmd, cwd=app_path)
 
         # Stop tracing
+        runtime.run('lttng stop')
         runtime.run('lttng destroy -a')
         cp = runtime.subprocess_terminate(sessiond)
         if cp.returncode != 0:

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 65564ea25249dc92d35ed6f923b210a2c1a6119c..c67c46231c59309e8c460e5907028d57ef7256de 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
@@ -165,6 +165,7 @@ def test_ust_app_tracing_available(tmpdir, ust_label, tools_label, outcome):
         runtime_app.run(cmd, cwd=app_path)
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         cp = runtime_tools.subprocess_terminate(sessiond)
         if cp.returncode != 0:
@@ -240,6 +241,7 @@ def test_ust_app_regen_statedump(tmpdir, ust_label, tools_label, success):
         utils.create_empty_file(app_sync_end)
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         cp = runtime_tools.subprocess_terminate(sessiond)
         if cp.returncode != 0:
@@ -308,6 +310,7 @@ def test_ust_app_starglobing_enabler(tmpdir, ust_label, tools_label, scenario):
         runtime_app.run(cmd, cwd=app_path)
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         cp = runtime_tools.subprocess_terminate(sessiond)
         if cp.returncode != 0:

diff --git a/lttng_ivc/tests/ust_java_agent_vs_tools/test_ust_java_agent_vs_tools.py b/lttng_ivc/tests/ust_java_agent_vs_tools/test_ust_java_agent_vs_tools.py
index 854743b8131972f84c72bb5d7deb3c604ce90992..d81af99e2a12957c05d4836109a5e881ed821a08 100644 (file)
--- a/lttng_ivc/tests/ust_java_agent_vs_tools/test_ust_java_agent_vs_tools.py
+++ b/lttng_ivc/tests/ust_java_agent_vs_tools/test_ust_java_agent_vs_tools.py
@@ -137,6 +137,7 @@ def test_ust_java_agent_tracing_available(tmpdir, ust_label, tools_label, app_ve
         runtime_app.run(cmd, cwd=app_path)
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         cp = runtime_tools.subprocess_terminate(sessiond)
         if cp.returncode != 0:
@@ -199,6 +200,7 @@ def test_ust_java_agent_interface(tmpdir, ust_label, tools_label, app_version, o
         runtime_tools.run(cmd, cwd=app_path, classpath=ust_classpath)
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         cp = runtime_tools.subprocess_terminate(sessiond)
         if cp.returncode != 0:

diff --git a/lttng_ivc/tests/ust_python_agent_vs_tools/test_ust_python_agent_vs_tools.py b/lttng_ivc/tests/ust_python_agent_vs_tools/test_ust_python_agent_vs_tools.py
index a39c00953a39ed46eca5ab62415eca6585321de7..0c0eafb9432ccb12421633c19ff6c8719a150c65 100644 (file)
--- a/lttng_ivc/tests/ust_python_agent_vs_tools/test_ust_python_agent_vs_tools.py
+++ b/lttng_ivc/tests/ust_python_agent_vs_tools/test_ust_python_agent_vs_tools.py
@@ -132,6 +132,7 @@ def test_ust_python_agent_tracing_available(tmpdir, ust_label, tools_label, shou
         runtime_app.run(cmd, cwd=app_path)
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         cp = runtime_tools.subprocess_terminate(sessiond)
         if cp.returncode != 0:
@@ -195,6 +196,7 @@ def test_ust_python_agent_interface(tmpdir, ust_label, tools_label, outcome):
         runtime_tools.run(cmd, cwd=app_path)
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         cp = runtime_tools.subprocess_terminate(sessiond)
         if cp.returncode != 0:

diff --git a/lttng_ivc/tests/ust_tracepoint_ABI-API_vs_ust/test_ust_tracepoint_ABI_API_vs_ust.py b/lttng_ivc/tests/ust_tracepoint_ABI-API_vs_ust/test_ust_tracepoint_ABI_API_vs_ust.py
index 237d9893567958f9fcd8fc74d80a56deaa622fdf..cc44e45eba4d19f706a1b19e1089dc7a2729cfbf 100644 (file)
--- a/lttng_ivc/tests/ust_tracepoint_ABI-API_vs_ust/test_ust_tracepoint_ABI_API_vs_ust.py
+++ b/lttng_ivc/tests/ust_tracepoint_ABI-API_vs_ust/test_ust_tracepoint_ABI_API_vs_ust.py
@@ -162,6 +162,7 @@ def test_ust_tracepoint_abi_api_vs_ust_enum(tmpdir, ust_label, tools_label, scen
         runtime_tools.run(cmd, cwd=app_path, ld_preload="./libtp-enum.so")
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         runtime_tools.subprocess_terminate(sessiond)
 
@@ -218,6 +219,7 @@ def test_ust_tracepoint_abi_api_vs_ust_base(tmpdir, ust_label, tools_label, scen
         runtime_tools.run(cmd, cwd=app_path, ld_preload="./libtp.so")
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         runtime_tools.subprocess_terminate(sessiond)
 

diff --git a/lttng_ivc/tests/ust_tracepoint_probe_ABI-API_vs_ust/test_ust_tracepoint_probe_ABI_API_vs_ust.py b/lttng_ivc/tests/ust_tracepoint_probe_ABI-API_vs_ust/test_ust_tracepoint_probe_ABI_API_vs_ust.py
index ec04fab0ee2ff170fad68b29b228b439766f1234..f20950aed73bb5de6951caf1b6364eff687717db 100644 (file)
--- a/lttng_ivc/tests/ust_tracepoint_probe_ABI-API_vs_ust/test_ust_tracepoint_probe_ABI_API_vs_ust.py
+++ b/lttng_ivc/tests/ust_tracepoint_probe_ABI-API_vs_ust/test_ust_tracepoint_probe_ABI_API_vs_ust.py
@@ -162,6 +162,7 @@ def test_ust_tracepoint_abi_api_vs_ust_enum(tmpdir, ust_label, tools_label, scen
         runtime_tools.run(cmd, cwd=app_path, ld_preload="./libtp-enum.so")
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         runtime_tools.subprocess_terminate(sessiond)
 
@@ -218,6 +219,7 @@ def test_ust_tracepoint_probe_abi_api_vs_ust_base(tmpdir, ust_label, tools_label
         runtime_tools.run(cmd, cwd=app_path, ld_preload="./libtp.so")
 
         # Stop tracing
+        runtime_tools.run('lttng stop')
         runtime_tools.run('lttng destroy -a')
         runtime_tools.subprocess_terminate(sessiond)