Skip to content

Commit

Permalink
[3.12] pythongh-89392: Remove support of test_main() in libregrtest (p…
Browse files Browse the repository at this point in the history
…ythonGH-108876).

(cherry picked from commit 04a0830)

Co-authored-by: Serhiy Storchaka <[email protected]>
  • Loading branch information
serhiy-storchaka committed Sep 5, 2023
1 parent 88ff02e commit 06901ab
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
9 changes: 4 additions & 5 deletions Lib/test/libregrtest/runtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,11 +345,10 @@ def _load_run_test(result: TestResult, ns: Namespace) -> None:

the_module = importlib.import_module(abstest)

# If the test has a test_main, that will run the appropriate
# tests. If not, use normal unittest test loading.
test_func = getattr(the_module, "test_main", None)
if test_func is None:
test_func = functools.partial(_test_module, the_module)
if hasattr(the_module, "test_main"):
# https://github.com/python/cpython/issues/89392
raise Exception(f"Module {result.test_name} defines test_main() which is no longer supported by regrtest")
test_func = functools.partial(_test_module, the_module)

try:
with save_env(ns, result.test_name):
Expand Down
8 changes: 4 additions & 4 deletions Lib/test/test_regrtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1678,9 +1678,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)

Expand All @@ -1689,7 +1689,7 @@ def test_main():
self.check_executed_tests(output, [testname],
failed=[testname],
randomize=True,
stats=TestStats(3, 2, 0))
stats=TestStats(1, 1, 0))


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

0 comments on commit 06901ab

Please sign in to comment.