mirror of https://github.com/python/cpython.git
[3.11] gh-89392: Remove support of test_main() in libregrtest (GH-108876) (GH-108898)
(cherry picked from commit 04a0830b00
)
This commit is contained in:
parent
562c168856
commit
492e1ffdce
|
@ -341,11 +341,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):
|
||||
|
|
|
@ -1680,9 +1680,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)
|
||||
|
||||
|
@ -1691,7 +1691,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):
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Removed support of ``test_main()`` function in tests. They now always use
|
||||
normal unittest test runner.
|
Loading…
Reference in New Issue