From: T. Wouters <thomas@python.org>
Date: Thu, 15 Feb 2024 13:24:13 +0000 (+0100)
Subject: gh-115490: Work around test.support.interpreters.channels not handling unloading... 
X-Git-Tag: v3.13.0a4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0e5c35ded6d4a16d7a021c10c99bac94250edd0;p=thirdparty%2FPython%2Fcpython.git

gh-115490: Work around test.support.interpreters.channels not handling unloading (#115515)

Work around test.support.interpreters.channels not handling unloading, which
regrtest does when running tests sequentially, by explicitly skipping the
unloading of test.support.interpreters and its submodules.

This can be rolled back once test.support.interpreters.channels supports
unloading, if we are keeping sequential runs in the same process around.
---

diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 7ca1b1cb65ae..b24c1b920545 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -335,10 +335,15 @@ class Regrtest:
 
             result = self.run_test(test_name, runtests, tracer)
 
-            # Unload the newly imported test modules (best effort finalization)
+            # Unload the newly imported test modules (best effort
+            # finalization). To work around gh-115490, don't unload
+            # test.support.interpreters and its submodules even if they
+            # weren't loaded before.
+            keep = "test.support.interpreters"
             new_modules = [module for module in sys.modules
                            if module not in save_modules and
-                                module.startswith(("test.", "test_"))]
+                                module.startswith(("test.", "test_"))
+                                and not module.startswith(keep)]
             for module in new_modules:
                 sys.modules.pop(module, None)
                 # Remove the attribute of the parent module.