Commit f905ed1972 for bind
commit f905ed1972042f994614e8caf834fca6e2d3aa96
Author: Štěpán Balážik <stepan@isc.org>
Date: Wed Sep 16 10:38:13 2026 +0200
Fix the references to the temporary system test directories
The pylint ignore pattern still spells the run directories with
underscores, which they have not used since 9f4c1d1993, and the
dangerfile still allows for hyphens in system test names, which it
rejects itself; two comments describe the directories wrongly as well.
Assisted-by: Claude:claude-fable-5-1
diff --git a/bin/tests/system/.gitignore b/bin/tests/system/.gitignore
index a59bb20737..e362beb9b1 100644
--- a/bin/tests/system/.gitignore
+++ b/bin/tests/system/.gitignore
@@ -27,6 +27,6 @@ named.run
# Ignore file names with a hyphen in their name except C files.
# This is done to ignore the temporary directories and symlinks created by the
-# pytest runner, which contain underscore in their file names.
+# pytest runner, which contain a hyphen in their file names.
/*-*
!/*-*.c
diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py
index 1713c42e44..608de2e318 100644
--- a/bin/tests/system/conftest.py
+++ b/bin/tests/system/conftest.py
@@ -125,7 +125,7 @@ def pytest_ignore_collect(collection_path):
# from previous runs could mess with the runner. Also ignore the
# convenience symlinks to those test directories. In both of those
# cases, the system test name (directory) contains a hyphen, which
- # is otherwise and invalid character for a system test name.
+ # is otherwise an invalid character for a system test name.
match = SYSTEM_TEST_NAME_RE.search(str(collection_path))
if match is None:
isctest.log.warning("unexpected test path: %s (ignored)", collection_path)
diff --git a/dangerfile.py b/dangerfile.py
index 2b74eb7883..c1ab951981 100644
--- a/dangerfile.py
+++ b/dangerfile.py
@@ -566,7 +566,7 @@ for log_level in user_visible_log_levels:
# SYSTEM TEST FILES
###############################################################################
#
-# FAIL if newly added system test directory contains an underscore (invalid char)
+# FAIL if newly added system test directory contains a hyphen (invalid char)
# FAIL if there are no pytest files in the system test directory
# FAIL if the pytest glue file for tests.sh is missing
@@ -597,7 +597,7 @@ for testname in testnames:
"`tests_*.py` pytest file."
)
tests_sh_exists = os.path.exists(f"{dirpath}/tests.sh")
- glue_file_name = f"tests_sh_{testname.replace('-', '_')}.py"
+ glue_file_name = f"tests_sh_{testname}.py"
tests_sh_py_exists = os.path.exists(f"{dirpath}/{glue_file_name}")
if tests_sh_exists and not tests_sh_py_exists:
fail(
diff --git a/pyproject.toml b/pyproject.toml
index 590b900fcd..b398ed0a91 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,7 +40,7 @@ ignore-paths = [
".git",
# Temporary directories created by the system test runner
# (see bin/tests/system/conftest.py:system_test_dir)
- "bin/tests/system/.*_tmp_.*/",
+ "bin/tests/system/.*-tmp-.*/",
"bin/tests/system/vulture_ignore_list.py",
"contrib",
"dangerfile.py",