From 63b1f95505c0743806a280f58e35215a0722b269 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Thu, 26 Oct 2023 11:31:41 +0300 Subject: [PATCH 1/2] gh-111348: Do not allow `test_doctest` to be run directly, remove `test_coverage` --- Lib/test/test_doctest.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index 6e12e82a7a0084..e51f54ef35cf0e 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -3218,19 +3218,8 @@ def load_tests(loader, tests, pattern): return tests -def test_coverage(coverdir): - trace = import_helper.import_module('trace') - tracer = trace.Trace(ignoredirs=[sys.base_prefix, sys.base_exec_prefix,], - trace=0, count=1) - tracer.run('test_main()') - r = tracer.results() - print('Writing coverage results...') - r.write_results(show_missing=True, summary=True, - coverdir=coverdir) - - if __name__ == '__main__': - if '-c' in sys.argv: - test_coverage('/tmp/doctest.cover') - else: - unittest.main() + raise RuntimeError( + "Running `test_doctest` via cmdline is not supported, " + "use `-m test test_doctest` instead" + ) From 776dff1a5dec88957ffd8d3784b562c76e4a5cfe Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Thu, 26 Oct 2023 15:18:21 +0300 Subject: [PATCH 2/2] Update Lib/test/test_doctest.py Co-authored-by: Sergey B Kirpichev --- Lib/test/test_doctest.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index e51f54ef35cf0e..7efc33dedb2caf 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -3219,7 +3219,4 @@ def load_tests(loader, tests, pattern): if __name__ == '__main__': - raise RuntimeError( - "Running `test_doctest` via cmdline is not supported, " - "use `-m test test_doctest` instead" - ) + unittest.main(module='test.test_doctest')