gh-89392: Remove support of test_main() in libregrtest (GH-108876)

serhiy-storchaka · web-flow · commit 04a0830b0087 · 2023-09-05T08:36:43.000+03:00
diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py
@@ -440,14 +440,11 @@ def _load_run_test(result: TestResult, ns: Namespace) -> None:
 
     test_mod = importlib.import_module(module_name)
 
-    # If the test has a test_main, that will run the appropriate
-    # tests.  If not, use normal unittest test runner.
-    test_main = getattr(test_mod, "test_main", None)
-    if test_main is not None:
-        test_func = test_main
-    else:
-        def test_func():
-            return run_unittest(test_mod)
+    if hasattr(test_mod, "test_main"):
+        # https://github.com/python/cpython/issues/89392
+        raise Exception("Module {result.test_name} defines test_main() which is no longer supported by regrtest")
+    def test_func():
+        return run_unittest(test_mod)
 
     try:
         with save_env(ns, result.test_name):
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
@@ -1803,9 +1803,9 @@ def my_function():
                 7948648
                 """
 
-            def test_main():
-                testmod = sys.modules[__name__]
-                return support.run_doctest(testmod)
+            def load_tests(loader, tests, pattern):
+                tests.addTest(doctest.DocTestSuite())
+                return tests
         ''')
         testname = self.create_test(code=code)
 
@@ -1814,7 +1814,7 @@ def test_main():
         self.check_executed_tests(output, [testname],
                                   failed=[testname],
                                   randomize=True,
-                                  stats=TestStats(4, 2, 1))
+                                  stats=TestStats(1, 1, 0))
 
 
 class TestUtils(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/Tests/2023-09-04-15-18-14.gh-issue-89392.8A4T5p.rst b/Misc/NEWS.d/next/Tests/2023-09-04-15-18-14.gh-issue-89392.8A4T5p.rst
@@ -0,0 +1,2 @@
+Removed support of ``test_main()`` function in tests. They now always use
+normal unittest test runner.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Removed support of ``test_main()`` function in tests. They now always use
	`2`	`+normal unittest test runner.`