]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Resolve the system_test_dir in pytest
authorNicki Křížek <nicki@isc.org>
Mon, 26 Jan 2026 17:37:00 +0000 (18:37 +0100)
committerNicki Křížek <nicki@isc.org>
Tue, 27 Jan 2026 11:33:33 +0000 (12:33 +0100)
If the system_test_dir contains a symlink, then it might cause issues
further down when using relative_to(), unless it is resolved first. This
has been observed on FreeBSD13 in CI where /home is a symlink to
/usr/home.

(cherry picked from commit b1e346905912db53c9e92b2729849e3bb6f74816)

bin/tests/system/conftest.py

index 790bb66e9c702394300bf760e1c68fc3b15ffd2c..8fc9dd8a11aa366fb7c1ac84129428fbb0af3a81 100644 (file)
@@ -445,7 +445,9 @@ def system_test_dir(request, env, system_test_name, expected_artifacts):
         ), f"Unexpected files found in test directory: {unexpected_files}"
 
     # Create a temporary directory with a copy of the original system test dir contents
-    system_test_root = Path(f"{env['TOP_BUILDDIR']}/{SYSTEM_TEST_DIR_GIT_PATH}")
+    system_test_root = Path(
+        f"{env['TOP_BUILDDIR']}/{SYSTEM_TEST_DIR_GIT_PATH}"
+    ).resolve()
     testdir = Path(
         tempfile.mkdtemp(prefix=f"{system_test_name}_tmp_", dir=system_test_root)
     )