From 5e3c0b846303ea33d870b6e614836a99717e9f22 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Tue, 26 May 2026 16:40:13 +0000 Subject: [PATCH] Prioritize the 10 slowest system test scopes Update PRIORITY_TESTS with the 10 longest-running test scopes measured from CI (job 7468217). These get scheduled first so that with --dist=loadscope they land on separate workers instead of piling up at the end. Also fix "serve-stale/" to "serve_stale/" to match the actual directory name, and add a startup check that fails if any PRIORITY_TESTS entry does not match an existing directory. Assisted-by: Claude:claude-opus-4-7 --- bin/tests/system/conftest.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py index 35e9c1c30e..5e8473e424 100644 --- a/bin/tests/system/conftest.py +++ b/bin/tests/system/conftest.py @@ -38,13 +38,26 @@ import isctest FILE_DIR = os.path.abspath(Path(__file__).parent) PRIORITY_TESTS = [ - # Tests that are scheduled first. Speeds up parallel execution. - "rpz/", - "rpzrecurse/", - "serve-stale/", + # Ten tests that are scheduled first. Speeds up parallel execution. + # Sorted by observed duration (longest first), measured from CI. "timeouts/", - "upforwd/", + "rpzrecurse/", + "nsupdate/", + "serve_stale/", + "doth/", + "resolver/", + "proxy/", + "catz/", + "digdelv/", + "rpz/", ] +for _p in PRIORITY_TESTS: + _dir = os.path.join(FILE_DIR, _p.rstrip("/")) + if not os.path.isdir(_dir): + raise RuntimeError( + f"PRIORITY_TESTS entry {_p!r} does not match a directory: {_dir}" + ) + PRIORITY_TESTS_RE = Re("|".join(PRIORITY_TESTS)) SYSTEM_TEST_NAME_RE = Re(f"{SYSTEM_TEST_DIR_GIT_PATH}" + r"/([^/]+)") SYMLINK_REPLACEMENT_RE = Re(r"/tests_(.*)\.py")