From 4ba0d4e71d2f5b72e22b427ea3b4de00583a112b Mon Sep 17 00:00:00 2001
From: Nikita Sobolev <mail@sobolevn.me>
Date: Fri, 13 Oct 2023 20:05:03 +0300
Subject: [PATCH] [3.11] gh-108303: Move all inspect test files to
 `test_inspect/` (GH-109607)

---
 Lib/test/libregrtest/findtests.py                     |  1 +
 Lib/test/test_import/__init__.py                      |  1 -
 Lib/test/test_inspect/__init__.py                     |  6 ++++++
 Lib/test/{ => test_inspect}/inspect_fodder.py         |  0
 Lib/test/{ => test_inspect}/inspect_fodder2.py        |  0
 .../{ => test_inspect}/inspect_stock_annotations.py   |  0
 .../inspect_stringized_annotations.py                 |  0
 .../inspect_stringized_annotations_2.py               |  0
 Lib/test/{ => test_inspect}/test_inspect.py           | 11 ++++++-----
 Lib/test/test_tokenize.py                             |  2 +-
 Makefile.pre.in                                       |  1 +
 11 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 Lib/test/test_inspect/__init__.py
 rename Lib/test/{ => test_inspect}/inspect_fodder.py (100%)
 rename Lib/test/{ => test_inspect}/inspect_fodder2.py (100%)
 rename Lib/test/{ => test_inspect}/inspect_stock_annotations.py (100%)
 rename Lib/test/{ => test_inspect}/inspect_stringized_annotations.py (100%)
 rename Lib/test/{ => test_inspect}/inspect_stringized_annotations_2.py (100%)
 rename Lib/test/{ => test_inspect}/test_inspect.py (99%)

diff --git a/Lib/test/libregrtest/findtests.py b/Lib/test/libregrtest/findtests.py
index a4235b52eca0af..78343775bc5b99 100644
--- a/Lib/test/libregrtest/findtests.py
+++ b/Lib/test/libregrtest/findtests.py
@@ -21,6 +21,7 @@
     "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 131aebbd4e1f56..8632ac2e818fab 100644
--- 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
index 00000000000000..f2a39a3fe29c7f
--- /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 650d56e39c415c..6d4050a5ded100 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect/test_inspect.py
@@ -30,12 +30,13 @@
 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 62f152fe431d5b..b5f57f693474d2 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1624,7 +1624,7 @@ def test_random_files(self):
         # 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 49238902718eb8..ada866d83c0423 100644
--- 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 \