Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 2 commits into from
Sep 5, 2023
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59b2995
gh-89392: Remove support of test_main() in libregrtest
serhiy-storchaka Sep 4, 2023
8e2ef4e
Update Lib/test/libregrtest/runtest.py
serhiy-storchaka Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions Lib/test/libregrtest/runtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,14 +440,9 @@ 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)
assert not hasattr(test_mod, "test_main")

@vstinner vstinner Sep 4, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please replace the assert with a regular exception. Like:

if hasattr(test_mod, "test_main"):
    raise Exception("Module {result.test_name} defines test_main() which is no longer supported by regrtest")

Maybe add a comment linking to https://github.com/python/cpython/issues/89392.

Comment thread
serhiy-storchaka marked this conversation as resolved.
Outdated
def test_func():
return run_unittest(test_mod)

try:
with save_env(ns, result.test_name):
Expand Down
8 changes: 4 additions & 4 deletions Lib/test/test_regrtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,9 +1802,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 @@ -1813,7 +1813,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):
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Tests/2023-09-04-15-18-14.gh-issue-89392.8A4T5p.rst
View file
Open in desktop
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.