Tests: Add pre-delete callbacks to TemporaryDirectory destructor

This will allow certain test clean-up operations (e.g., `umount`) to
be run before trying to to remove the directory.

Change-Id: I193030dfe4aeb0eeebc4370849681cbd9dcf500e
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/utils/lttngtest/environment.py b/tests/utils/lttngtest/environment.py
index 03c1b5c8168b2e8d97e2b0886da82bbf52fc8ab4..1cc87a1fe4fdfa0be522f20f0578ebb740f83dfb 100644 (file)
--- a/tests/utils/lttngtest/environment.py
+++ b/tests/utils/lttngtest/environment.py
@@ -32,11 +32,19 @@ import bt2
 class TemporaryDirectory:
     def __init__(self, prefix):
         # type: (str) -> None
+        self._cleanup_callbacks = []
         self._directory_path = tempfile.mkdtemp(prefix=prefix)
 
     def __del__(self):
-        if os.getenv("LTTNG_TEST_PRESERVE_TEST_ENV", "0") != "1":
-            shutil.rmtree(self._directory_path, ignore_errors=True)
+        try:
+            for func, args, kwargs in self._cleanup_callbacks:
+                func(*args, **kwargs)
+        finally:
+            if os.getenv("LTTNG_TEST_PRESERVE_TEST_ENV", "0") != "1":
+                shutil.rmtree(self._directory_path, ignore_errors=True)
+
+    def add_cleanup_callback(self, func, *args, **kwargs):
+        self._cleanup_callbacks.append((func, args, kwargs))
 
     @property
     def path(self):