pythongh-108303: Move all inspect test files to test_inspect/ (pyth…

…on#109607)
vstinner · Oct 10, 2023 · 732532b · 732532b
1 parent 9cfb4e0
commit 732532b
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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 → Lib/test/test_inspect/inspect_fodder.py b/Lib/test/inspect_fodder.py → Lib/test/test_inspect/inspect_fodder.py
diff --git a/Lib/test/inspect_fodder2.py → Lib/test/test_inspect/inspect_fodder2.py b/Lib/test/inspect_fodder2.py → Lib/test/test_inspect/inspect_fodder2.py
diff --git a/Lib/test/inspect_stock_annotations.py → ...test_inspect/inspect_stock_annotations.py b/Lib/test/inspect_stock_annotations.py → ...test_inspect/inspect_stock_annotations.py
diff --git a/Lib/test/inspect_stringized_annotations.py → ...inspect/inspect_stringized_annotations.py b/Lib/test/inspect_stringized_annotations.py → ...inspect/inspect_stringized_annotations.py
diff --git a/Lib/test/inspect_stringized_annotations_2.py → ...spect/inspect_stringized_annotations_2.py b/Lib/test/inspect_stringized_annotations_2.py → ...spect/inspect_stringized_annotations_2.py
diff --git a/Lib/test/test_inspect.py → Lib/test/test_inspect/test_inspect.py b/Lib/test/test_inspect.py → 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
@@ -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
@@ -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 \