From 1cd816fd51c055b54a6baf27e829ffc3eb305ed3 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 15 Nov 2017 13:47:16 -0500 Subject: [PATCH] Unload test module only if it was loaded Signed-off-by: Jonathan Rajotte --- lttng_ivc/utils/runtime.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lttng_ivc/utils/runtime.py b/lttng_ivc/utils/runtime.py index 3a776cb..9efdabe 100644 --- a/lttng_ivc/utils/runtime.py +++ b/lttng_ivc/utils/runtime.py @@ -46,6 +46,7 @@ class Runtime(object): self._runtime_log_aggregation = os.path.join(self.__runtime_log, "runtime.log") self._run_command_count = 0 + self._is_test_modules_loaded = False self.special_env_variables = {"LTTNG_UST_DEBUG": "1", "LTTNG_APP_SOCKET_TIMEOUT": "-1", @@ -239,10 +240,12 @@ class Runtime(object): def load_test_module(self): # Base directory is provided by env self.run("modprobe lttng-test") + self._is_test_modules_loaded = True def unload_test_module(self, check_return=True): # Base directory is provided by env - self.run("modprobe -r lttng-test", check_return=check_return) + if self._is_test_modules_loaded: + self.run("modprobe -r lttng-test", check_return=check_return) def close(self): for key, subp in self.__subprocess.items(): -- 2.34.1