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

(cherry picked from commit 732532b0af9d1b5c7ae4932526c8d20d86c15507)

diff --git a/Lib/test/libregrtest/findtests.py b/Lib/test/libregrtest/findtests.py
index 96cc3e0d02118412d7f9b24daa0ec0123b347b79..caf2872cfc9a18fa8a07b13b704da8e6bc0765c3 100644 (file)
--- a/Lib/test/libregrtest/findtests.py
+++ b/Lib/test/libregrtest/findtests.py
@@ -20,6 +20,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 8994f146b0155f8851cb7bc1236917d740e72a0b..67904cf42566918e4ae35ba306cf62eb703f8f8e 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 json

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 6f260c9a71782c415c28f8f7937f178d9b67a373..4a96502abffb66859bad571fb487b6a947a99200 100644 (file)
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect/test_inspect.py
@@ -31,12 +31,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 b8d069a87843e461a8536458a95104911145d00b..57fc149b6a4fa8d9e66316032e570238b57a1a91 100644 (file)
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1908,7 +1908,7 @@ class TestRoundtrip(TestCase):
         # TODO: Remove this once we can untokenize PEP 701 syntax
         testfiles.remove(os.path.join(tempdir, "test_fstring.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 aa2ac012affc1857911fd72bfffec2d9446463b6..0cb9db744433a9b6f6f4d1167b5f3c13481ad06a 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2141,6 +2141,7 @@ TESTSUBDIRS=      idlelib/idle_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 \