Skip to content

Commit d52bdfb

Browse files
authored
gh-83434: Disable XML in regrtest when -R option is used (#117232)
1 parent 9f74e86 commit d52bdfb

File tree

3 files changed

+34
-1
lines changed

3 files changed

+34
-1
lines changed

Lib/test/libregrtest/cmdline.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ def __init__(self, **kwargs) -> None:
173173
self.fail_rerun = False
174174
self.tempdir = None
175175
self._add_python_opts = True
176+
self.xmlpath = None
176177

177178
super().__init__(**kwargs)
178179

@@ -506,17 +507,28 @@ def _parse_args(args, **kwargs):
506507
ns.randomize = True
507508
if ns.verbose:
508509
ns.header = True
510+
509511
# When -jN option is used, a worker process does not use --verbose3
510512
# and so -R 3:3 -jN --verbose3 just works as expected: there is no false
511513
# alarm about memory leak.
512514
if ns.huntrleaks and ns.verbose3 and ns.use_mp is None:
513-
ns.verbose3 = False
514515
# run_single_test() replaces sys.stdout with io.StringIO if verbose3
515516
# is true. In this case, huntrleaks sees an write into StringIO as
516517
# a memory leak, whereas it is not (gh-71290).
518+
ns.verbose3 = False
517519
print("WARNING: Disable --verbose3 because it's incompatible with "
518520
"--huntrleaks without -jN option",
519521
file=sys.stderr)
522+
523+
if ns.huntrleaks and ns.xmlpath:
524+
# The XML data is written into a file outside runtest_refleak(), so
525+
# it looks like a leak but it's not. Simply disable XML output when
526+
# hunting for reference leaks (gh-83434).
527+
ns.xmlpath = None
528+
print("WARNING: Disable --junit-xml because it's incompatible "
529+
"with --huntrleaks",
530+
file=sys.stderr)
531+
520532
if ns.forever:
521533
# --forever implies --failfast
522534
ns.failfast = True

Lib/test/test_regrtest.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,24 @@ def test_bisect(self):
464464
regrtest = self.create_regrtest(args)
465465
self.assertTrue(regrtest.want_bisect)
466466

467+
def test_verbose3_huntrleaks(self):
468+
args = ['-R', '3:10', '--verbose3']
469+
with support.captured_stderr():
470+
regrtest = self.create_regrtest(args)
471+
self.assertIsNotNone(regrtest.hunt_refleak)
472+
self.assertEqual(regrtest.hunt_refleak.warmups, 3)
473+
self.assertEqual(regrtest.hunt_refleak.runs, 10)
474+
self.assertFalse(regrtest.output_on_failure)
475+
476+
def test_xml_huntrleaks(self):
477+
args = ['-R', '3:12', '--junit-xml', 'output.xml']
478+
with support.captured_stderr():
479+
regrtest = self.create_regrtest(args)
480+
self.assertIsNotNone(regrtest.hunt_refleak)
481+
self.assertEqual(regrtest.hunt_refleak.warmups, 3)
482+
self.assertEqual(regrtest.hunt_refleak.runs, 12)
483+
self.assertIsNone(regrtest.junit_filename)
484+
467485

468486
@dataclasses.dataclass(slots=True)
469487
class Rerun:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Disable JUnit XML output (``--junit-xml=FILE`` command line option) in
2+
regrtest when hunting for reference leaks (``-R`` option). Patch by Victor
3+
Stinner.

0 commit comments

Comments
 (0)