pythongh-108303: Move all doctest related files and tests to `Lib/tes…

…t/test_doctest/`
sobolevn · Nov 15, 2023 · 49a6473 · 49a6473
1 parent d4f83e1
commit 49a6473
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 78 deletions.
diff --git a/Lib/test/libregrtest/findtests.py b/Lib/test/libregrtest/findtests.py
@@ -19,6 +19,7 @@
 SPLITTESTDIRS: set[TestName] = {
     "test_asyncio",
     "test_concurrent_futures",
+    "test_doctests",
     "test_future_stmt",
     "test_gdb",
     "test_inspect",

diff --git a/Lib/test/test_doctest/__init__.py b/Lib/test/test_doctest/__init__.py
@@ -0,0 +1,5 @@
+import os
+from test.support import load_package_tests
+
+def load_tests(*args):
+    return load_package_tests(os.path.dirname(__file__), *args)
diff --git a/Lib/test/doctest_aliases.py → Lib/test/test_doctest/doctest_aliases.py b/Lib/test/doctest_aliases.py → Lib/test/test_doctest/doctest_aliases.py
diff --git a/Lib/test/doctest_lineno.py → Lib/test/test_doctest/doctest_lineno.py b/Lib/test/doctest_lineno.py → Lib/test/test_doctest/doctest_lineno.py
diff --git a/Lib/test/sample_doctest.py → Lib/test/test_doctest/sample_doctest.py b/Lib/test/sample_doctest.py → Lib/test/test_doctest/sample_doctest.py
@@ -32,8 +32,8 @@ def bar():
 def test_silly_setup():
     """
 
-    >>> import test.test_doctest
-    >>> test.test_doctest.sillySetup
+    >>> import test.test_doctest.test_doctest
+    >>> test.test_doctest.test_doctest.sillySetup
     True
     """
 

diff --git a/Lib/test/sample_doctest_no_docstrings.py → ...t_doctest/sample_doctest_no_docstrings.py b/Lib/test/sample_doctest_no_docstrings.py → ...t_doctest/sample_doctest_no_docstrings.py
diff --git a/Lib/test/sample_doctest_no_doctests.py → ...est_doctest/sample_doctest_no_doctests.py b/Lib/test/sample_doctest_no_doctests.py → ...est_doctest/sample_doctest_no_doctests.py
diff --git a/Lib/test/test_doctest.py → Lib/test/test_doctest/test_doctest.py b/Lib/test/test_doctest.py → Lib/test/test_doctest/test_doctest.py
diff --git a/Lib/test/test_doctest.txt → Lib/test/test_doctest/test_doctest.txt b/Lib/test/test_doctest.txt → Lib/test/test_doctest/test_doctest.txt
diff --git a/Lib/test/test_doctest2.py → Lib/test/test_doctest/test_doctest2.py b/Lib/test/test_doctest2.py → Lib/test/test_doctest/test_doctest2.py
diff --git a/Lib/test/test_doctest2.txt → Lib/test/test_doctest/test_doctest2.txt b/Lib/test/test_doctest2.txt → Lib/test/test_doctest/test_doctest2.txt
@@ -2,8 +2,8 @@ This is a sample doctest in a text file.
 
 In this example, we'll rely on some silly setup:
 
-  >>> import test.test_doctest
-  >>> test.test_doctest.sillySetup
+  >>> import test.test_doctest.test_doctest
+  >>> test.test_doctest.test_doctest.sillySetup
   True
 
 This test also has some (random) encoded (utf-8) unicode text:

diff --git a/Lib/test/test_doctest3.txt → Lib/test/test_doctest/test_doctest3.txt b/Lib/test/test_doctest3.txt → Lib/test/test_doctest/test_doctest3.txt
diff --git a/Lib/test/test_doctest4.txt → Lib/test/test_doctest/test_doctest4.txt b/Lib/test/test_doctest4.txt → Lib/test/test_doctest/test_doctest4.txt
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -2201,6 +2201,7 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/test_cppext \
 		test/test_ctypes \
 		test/test_dataclasses \
+		test/test_doctest \
 		test/test_email \
 		test/test_email/data \
 		test/test_future_stmt \