summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-11-01 03:57:23 (GMT)
committerGitHub <noreply@github.com>2023-11-01 03:57:23 (GMT)
commit1d7ad7780a9365bddfa6ba9dbba2e390ca55fba7 (patch)
treedee254ab33c060f60dfbda46550b118c2f3a0124 /Lib
parent2bb10acfdd9782e36534a1cb95bec520d0338ab6 (diff)
downloadcpython-1d7ad7780a9365bddfa6ba9dbba2e390ca55fba7.zip
cpython-1d7ad7780a9365bddfa6ba9dbba2e390ca55fba7.tar.gz
cpython-1d7ad7780a9365bddfa6ba9dbba2e390ca55fba7.tar.bz2
[3.11] gh-110367: Make regrtest --verbose3 compatible with --huntrleaks -jN (GH-111577) (#111590)
gh-110367: Make regrtest --verbose3 compatible with --huntrleaks -jN (GH-111577) "./python -m test -j1 -R 3:3 --verbose3" now works as expected, since run_single_test() does not replace sys.stdout with StringIO in this case. (cherry picked from commit d9a5530d2327efa1fe66a04d31b5c67e42dbcd9c) Co-authored-by: Victor Stinner <vstinner@python.org>
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/libregrtest/cmdline.py10
-rw-r--r--Lib/test/test_regrtest.py23
2 files changed, 31 insertions, 2 deletions
diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py
index 905b3f8..9ba6ec6 100644
--- a/Lib/test/libregrtest/cmdline.py
+++ b/Lib/test/libregrtest/cmdline.py
@@ -494,10 +494,16 @@ def _parse_args(args, **kwargs):
ns.randomize = True
if ns.verbose:
ns.header = True
- if ns.huntrleaks and ns.verbose3:
+ # When -jN option is used, a worker process does not use --verbose3
+ # and so -R 3:3 -jN --verbose3 just works as expected: there is no false
+ # alarm about memory leak.
+ if ns.huntrleaks and ns.verbose3 and ns.use_mp is None:
ns.verbose3 = False
+ # run_single_test() replaces sys.stdout with io.StringIO if verbose3
+ # is true. In this case, huntrleaks sees an write into StringIO as
+ # a memory leak, whereas it is not (gh-71290).
print("WARNING: Disable --verbose3 because it's incompatible with "
- "--huntrleaks: see http://bugs.python.org/issue27103",
+ "--huntrleaks without -jN option",
file=sys.stderr)
if ns.forever:
# --forever implies --failfast
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index aa3f654..2f1bb03 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -2120,6 +2120,29 @@ class ArgsTestCase(BaseTestCase):
self.assertIn(f"Exit code {exitcode} (SIGSEGV)", output)
self.check_line(output, "just before crash!", full=True, regex=False)
+ def test_verbose3(self):
+ code = textwrap.dedent(r"""
+ import unittest
+ from test import support
+
+ class VerboseTests(unittest.TestCase):
+ def test_pass(self):
+ print("SPAM SPAM SPAM")
+ """)
+ testname = self.create_test(code=code)
+
+ # Run sequentially
+ output = self.run_tests("--verbose3", testname)
+ self.check_executed_tests(output, testname, stats=1)
+ self.assertNotIn('SPAM SPAM SPAM', output)
+
+ # -R option needs a debug build
+ if support.Py_DEBUG:
+ # Check for reference leaks, run in parallel
+ output = self.run_tests("-R", "3:3", "-j1", "--verbose3", testname)
+ self.check_executed_tests(output, testname, stats=1, parallel=True)
+ self.assertNotIn('SPAM SPAM SPAM', output)
+
class TestUtils(unittest.TestCase):
def test_format_duration(self):