From: Tom Krizek <tkrizek@isc.org>
Date: Thu, 10 Aug 2023 14:24:38 +0000 (+0200)
Subject: Improve tempdir logging for pytest runner
X-Git-Tag: v9.19.17~44^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f91d0b13e882f2b265412eadb958d2faa64974f8;p=thirdparty%2Fbind9.git

Improve tempdir logging for pytest runner

At the end of the test, display the symlink path to the artifact
directory in case it's preserved. Log the full tempdir name in debug
log.
---

diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py
index fd7510827fb..63b992eb40d 100644
--- a/bin/tests/system/conftest.py
+++ b/bin/tests/system/conftest.py
@@ -451,7 +451,7 @@ else:
         # System tests are meant to be executed from their directory - switch to it.
         old_cwd = os.getcwd()
         os.chdir(testdir)
-        mlogger.info("switching to tmpdir: %s", testdir)
+        mlogger.debug("switching to tmpdir: %s", testdir)
         try:
             yield testdir  # other fixtures / tests will execute here
         finally:
@@ -461,13 +461,27 @@ else:
             result = get_test_result()
 
             # Clean temporary dir unless it should be kept
+            keep = False
             if request.config.getoption("--noclean"):
-                mlogger.debug("--noclean requested, keeping temporary directory")
+                mlogger.debug(
+                    "--noclean requested, keeping temporary directory %s", testdir
+                )
+                keep = True
             elif result == "failed":
-                mlogger.debug("test failure detected, keeping temporary directory")
+                mlogger.debug(
+                    "test failure detected, keeping temporary directory %s", testdir
+                )
+                keep = True
             elif not request.node.stash[FIXTURE_OK]:
                 mlogger.debug(
-                    "test setup/teardown issue detected, keeping temporary directory"
+                    "test setup/teardown issue detected, keeping temporary directory %s",
+                    testdir,
+                )
+                keep = True
+
+            if keep:
+                mlogger.info(
+                    "test artifacts in: %s", symlink_dst.relative_to(system_test_root)
                 )
             else:
                 mlogger.debug("deleting temporary directory")