[3.11] gh-108303: Move all inspect test files to `test_inspect/` (GH-109607) (#111543)

diff --git a/Lib/test/libregrtest/findtests.py b/Lib/test/libregrtest/findtests.py
index a4235b52eca0afd4987cc471f004ff382e6c176d..78343775bc5b998998bbf270793abf86c8efc4aa 100644 (file)
--- a/Lib/test/libregrtest/findtests.py
+++ b/Lib/test/libregrtest/findtests.py
@@ -21,6 +21,7 @@ SPLITTESTDIRS: set[TestName] = {
     "test_concurrent_futures",
     "test_future_stmt",
     "test_gdb",
+    "test_inspect",
     "test_multiprocessing_fork",
     "test_multiprocessing_forkserver",
     "test_multiprocessing_spawn",

diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index 131aebbd4e1f560140c79d1bca29130713704a37..8632ac2e818fabed926bb2cace01c58401c2f460 100644 (file)
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -1,5 +1,4 @@
 import builtins
-import contextlib
 import errno
 import glob
 import importlib.util

diff --git a/Lib/test/test_inspect/__init__.py b/Lib/test/test_inspect/__init__.py
new file mode 100644 (file)
index 0000000..f2a39a3
--- /dev/null
+++ b/Lib/test/test_inspect/__init__.py
@@ -0,0 +1,6 @@
+import os
+from test import support
+
+
+def load_tests(*args):
+    return support.load_package_tests(os.path.dirname(__file__), *args)

diff --git a/Lib/test/inspect_fodder.py b/Lib/test/test_inspect/inspect_fodder.py
similarity index 100%
rename from Lib/test/inspect_fodder.py
rename to Lib/test/test_inspect/inspect_fodder.py

diff --git a/Lib/test/inspect_fodder2.py b/Lib/test/test_inspect/inspect_fodder2.py
similarity index 100%
rename from Lib/test/inspect_fodder2.py
rename to Lib/test/test_inspect/inspect_fodder2.py

diff --git a/Lib/test/inspect_stock_annotations.py b/Lib/test/test_inspect/inspect_stock_annotations.py
similarity index 100%
rename from Lib/test/inspect_stock_annotations.py
rename to Lib/test/test_inspect/inspect_stock_annotations.py

diff --git a/Lib/test/inspect_stringized_annotations.py b/Lib/test/test_inspect/inspect_stringized_annotations.py
similarity index 100%
rename from Lib/test/inspect_stringized_annotations.py
rename to Lib/test/test_inspect/inspect_stringized_annotations.py

diff --git a/Lib/test/inspect_stringized_annotations_2.py b/Lib/test/test_inspect/inspect_stringized_annotations_2.py
similarity index 100%
rename from Lib/test/inspect_stringized_annotations_2.py
rename to Lib/test/test_inspect/inspect_stringized_annotations_2.py

diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect/test_inspect.py
similarity index 99%
rename from Lib/test/test_inspect.py
rename to Lib/test/test_inspect/test_inspect.py
index 650d56e39c415cceab7862608d2310c9022c1257..6d4050a5ded10059335e74a01f94eb34e0e7d6c2 100644 (file)
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect/test_inspect.py
@@ -30,12 +30,13 @@ from test.support import MISSING_C_DOCSTRINGS, ALWAYS_EQ
 from test.support.import_helper import DirsOnSysPath, ready_to_import
 from test.support.os_helper import TESTFN
 from test.support.script_helper import assert_python_ok, assert_python_failure
-from test import inspect_fodder as mod
-from test import inspect_fodder2 as mod2
 from test import support
-from test import inspect_stock_annotations
-from test import inspect_stringized_annotations
-from test import inspect_stringized_annotations_2
+
+from . import inspect_fodder as mod
+from . import inspect_fodder2 as mod2
+from . import inspect_stock_annotations
+from . import inspect_stringized_annotations
+from . import inspect_stringized_annotations_2
 
 
 # Functions tested in this suite:

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 62f152fe431d5beacc8b1daeca9ff3f8a1d77539..b5f57f693474d23bef49ee214e3a0a0bd7008457 100644 (file)
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1624,7 +1624,7 @@ class TestRoundtrip(TestCase):
         # 7 more testfiles fail.  Remove them also until the failure is diagnosed.
 
         testfiles.remove(os.path.join(tempdir, "test_unicode_identifiers.py"))
-        for f in ('buffer', 'builtin', 'fileio', 'inspect', 'os', 'platform', 'sys'):
+        for f in ('buffer', 'builtin', 'fileio', 'os', 'platform', 'sys'):
             testfiles.remove(os.path.join(tempdir, "test_%s.py") % f)
 
         if not support.is_resource_enabled("cpu"):

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 49238902718eb8b5afb3c64c04a976f8ce41f264..ada866d83c04230fd55d2e515d14375fa6233364 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1969,6 +1969,7 @@ TESTSUBDIRS=      ctypes/test \
                test/test_email/data \
                test/test_future_stmt \
                test/test_gdb \
+               test/test_inspect \
                test/test_import \
                test/test_import/data \
                test/test_import/data/circular_imports \