From 732532b0af9d1b5c7ae4932526c8d20d86c15507 Mon Sep 17 00:00:00 2001
From: Nikita Sobolev <mail@sobolevn.me>
Date: Tue, 10 Oct 2023 23:15:11 +0300
Subject: [PATCH] gh-108303: Move all inspect test files to `test_inspect/`
 (#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 96cc3e0d021184..caf2872cfc9a18 100644
--- a/Lib/test/libregrtest/findtests.py
+++ b/Lib/test/libregrtest/findtests.py
@@ -20,6 +20,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 48553f9d48b010..aa465c70dfbcd0 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 json
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 f9bd632a01ed2e..31ac6b1070a0a2 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect/test_inspect.py
@@ -36,12 +36,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 9369560788719f..06517acb0b2439 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1911,7 +1911,7 @@ def test_random_files(self):
         # 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 043000c95624bb..f612f075df9abc 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2147,6 +2147,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 \