From 1e77e9fc8610db158ba1f1ea374e562672a89a8a Mon Sep 17 00:00:00 2001
From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com>
Date: Sat, 28 Feb 2026 11:48:04 +0100
Subject: [PATCH] More accurate test dependencies

---
 scripts/update_lib/cmd_todo.py | 18 +++++++++++++++---
 scripts/update_lib/deps.py     | 29 ++++++++++++-----------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/scripts/update_lib/cmd_todo.py b/scripts/update_lib/cmd_todo.py
index 2d5685fdd50..7810455885c 100644
--- a/scripts/update_lib/cmd_todo.py
+++ b/scripts/update_lib/cmd_todo.py
@@ -146,7 +146,11 @@ def get_all_tests(cpython_prefix: str) -> list[str]:
     tests = set()
     for entry in test_dir.iterdir():
         # Skip non-test items
-        if not entry.name.startswith(("_test", "test_")):
+        if "test" not in entry.name:
+            continue
+
+        # Exclude special cases
+        if "regrtest" in entry.name:
             continue
 
         if entry.is_file() and entry.suffix == ".py":
@@ -333,8 +337,16 @@ def compute_test_todo_list(
             # Get order from DEPENDENCIES
             test_order = lib_test_order[lib_name].index(test_name)
         else:
-            # Extract lib name from test name (test_foo -> foo)
-            lib_name = test_name.removeprefix("test_").removeprefix("_test")
+            # Extract lib name from test name:
+            # - test_foo -> foo
+            # - datetimetester -> datetime
+            # - xmltests -> xml
+            lib_name = (
+                test_name.removeprefix("test_")
+                .removeprefix("_test")
+                .removesuffix("tester")
+                .removesuffix("tests")
+            )
             test_order = 0  # Default order for tests not in DEPENDENCIES
 
         # Check if corresponding lib is up-to-date
diff --git a/scripts/update_lib/deps.py b/scripts/update_lib/deps.py
index 1b6c9ef7101..b09b3b97551 100644
--- a/scripts/update_lib/deps.py
+++ b/scripts/update_lib/deps.py
@@ -53,10 +53,7 @@ def test_imports(self) -> frozenset[str]:
     @property
     def lib_imports(self) -> frozenset[str]:
         return frozenset(
-            # module.split(".", 1)[0]
-            module
-            for module in self.__imports
-            if not module.startswith("test.")
+            module for module in self.__imports if not module.startswith("test.")
         )
 
     def visit_Import(self, node):
@@ -119,7 +116,7 @@ def visit_Call(self, node) -> None:
         self.__imports.add(f"test.{target}")
 
 
-def parse_test_imports(content: str) -> set[str]:
+def parse_test_imports(content: str) -> frozenset[str]:
     """Parse test file content and extract test package dependencies."""
     if not (tree := safe_parse_ast(content)):
         return set()
@@ -129,7 +126,7 @@ def parse_test_imports(content: str) -> set[str]:
     return visitor.test_imports
 
 
-def parse_lib_imports(content: str) -> set[str]:
+def parse_lib_imports(content: str) -> frozenset[str]:
     """Parse library file and extract all imported module names."""
     if not (tree := safe_parse_ast(content)):
         return set()
@@ -147,8 +144,7 @@ def parse_lib_imports(content: str) -> set[str]:
 def filter_rustpython_todo(content: str) -> str:
     """Remove lines containing RustPython TODO markers."""
     lines = content.splitlines(keepends=True)
-    filtered = [line for line in lines if TODO_MARKER not in line]
-    return "".join(filtered)
+    return "".join(line for line in lines if TODO_MARKER not in line)
 
 
 def count_rustpython_todo(content: str) -> int:
@@ -342,7 +338,7 @@ def clear_import_graph_caches() -> None:
     },
     "codecs": {
         "test": [
-            "test_codecs.py",
+            "test_charmapcodec.py",
             "test_codeccallbacks.py",
             "test_codecencodings_cn.py",
             "test_codecencodings_hk.py",
@@ -355,8 +351,9 @@ def clear_import_graph_caches() -> None:
             "test_codecmaps_jp.py",
             "test_codecmaps_kr.py",
             "test_codecmaps_tw.py",
-            "test_charmapcodec.py",
+            "test_codecs.py",
             "test_multibytecodec.py",
+            "testcodec.py",
         ],
     },
     # Non-pattern hard_deps (can't be auto-detected)
@@ -423,6 +420,7 @@ def clear_import_graph_caches() -> None:
             "test_multiprocessing_forkserver",
             "test_multiprocessing_spawn",
             "test_multiprocessing_main_handling.py",
+            "_test_multiprocessing.py",
         ],
     },
     "urllib": {
@@ -745,12 +743,9 @@ def resolve_hard_dep_parent(name: str, cpython_prefix: str) -> str | None:
     # Auto-detect _py{module} or _py_{module} patterns
     # Only if the parent module actually exists
     if name.startswith("_py"):
-        if name.startswith("_py_"):
-            # _py_abc -> abc
-            parent = name[4:]
-        else:
-            # _pydatetime -> datetime
-            parent = name[3:]
+        # _py_abc -> abc
+        # _pydatetime -> datetime
+        parent = name.removeprefix("_py_").removeprefix("_py")
 
         # Verify the parent module exists
         lib_dir = pathlib.Path(cpython_prefix) / "Lib"
@@ -781,7 +776,7 @@ def resolve_test_to_lib(test_name: str) -> str | None:
         tests = dep_info.get("test", [])
         for test_path in tests:
             # test_path is like "test_urllib2.py" or "test_multiprocessing_fork"
-            path_stem = test_path[:-3] if test_path.endswith(".py") else test_path
+            path_stem = test_path.removesuffix(".py")
             if path_stem == test_name:
                 return lib_name