diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py
index 3e7428c4ad3797..d4dac77b250ad6 100644
--- a/Lib/test/libregrtest/cmdline.py
+++ b/Lib/test/libregrtest/cmdline.py
@@ -520,15 +520,6 @@ def _parse_args(args, **kwargs):
"--huntrleaks without -jN option",
file=sys.stderr)
- if ns.huntrleaks and ns.xmlpath:
- # The XML data is written into a file outside runtest_refleak(), so
- # it looks like a leak but it's not. Simply disable XML output when
- # hunting for reference leaks (gh-83434).
- ns.xmlpath = None
- print("WARNING: Disable --junit-xml because it's incompatible "
- "with --huntrleaks",
- file=sys.stderr)
-
if ns.forever:
# --forever implies --failfast
ns.failfast = True
diff --git a/Lib/test/libregrtest/refleak.py b/Lib/test/libregrtest/refleak.py
index f582c0d3e7ff13..697f305cad1fbd 100644
--- a/Lib/test/libregrtest/refleak.py
+++ b/Lib/test/libregrtest/refleak.py
@@ -1,3 +1,4 @@
+import os
import sys
import warnings
from inspect import isabstract
@@ -23,6 +24,30 @@ def _get_dump(cls):
cls._abc_negative_cache, cls._abc_negative_cache_version)
+def save_support_xml(filename):
+ if support.junit_xml_list is None:
+ return
+
+ import pickle
+ with open(filename, 'xb') as fp:
+ pickle.dump(support.junit_xml_list, fp)
+ support.junit_xml_list = None
+
+
+def restore_support_xml(filename):
+ try:
+ fp = open(filename, 'rb')
+ except FileNotFoundError:
+ return
+
+ import pickle
+ with fp:
+ xml_list = pickle.load(fp)
+ os.unlink(filename)
+
+ support.junit_xml_list = xml_list
+
+
def runtest_refleak(test_name, test_func,
hunt_refleak: HuntRefleak,
quiet: bool):
@@ -95,7 +120,8 @@ def get_pooled_int(value):
numbers = numbers[:warmups] + ':' + numbers[warmups:]
print(numbers, file=sys.stderr, flush=True)
- results = None
+ xml_filename = 'refleak-xml.tmp'
+ result = None
dash_R_cleanup(fs, ps, pic, zdc, abcs)
support.gc_collect()
@@ -103,10 +129,11 @@ def get_pooled_int(value):
current = refleak_helper._hunting_for_refleaks
refleak_helper._hunting_for_refleaks = True
try:
- results = test_func()
+ result = test_func()
finally:
refleak_helper._hunting_for_refleaks = current
+ save_support_xml(xml_filename)
dash_R_cleanup(fs, ps, pic, zdc, abcs)
support.gc_collect()
@@ -145,6 +172,8 @@ def get_pooled_int(value):
fd_before = fd_after
interned_before = interned_after
+ restore_support_xml(xml_filename)
+
if not quiet:
print(file=sys.stderr)
@@ -189,7 +218,7 @@ def check_fd_deltas(deltas):
failed = True
else:
print(' (this is fine)', file=sys.stderr, flush=True)
- return (failed, results)
+ return (failed, result)
def dash_R_cleanup(fs, ps, pic, zdc, abcs):
diff --git a/Lib/test/libregrtest/single.py b/Lib/test/libregrtest/single.py
index fc2f2716ad4ce0..adc8f1f455579f 100644
--- a/Lib/test/libregrtest/single.py
+++ b/Lib/test/libregrtest/single.py
@@ -57,7 +57,10 @@ def _run_suite(suite):
result = runner.run(suite)
if support.junit_xml_list is not None:
- support.junit_xml_list.append(result.get_xml_element())
+ import xml.etree.ElementTree as ET
+ xml_elem = result.get_xml_element()
+ xml_str = ET.tostring(xml_elem).decode('ascii')
+ support.junit_xml_list.append(xml_str)
if not result.testsRun and not result.skipped and not result.errors:
raise support.TestDidNotRun
@@ -280,9 +283,7 @@ def _runtest(result: TestResult, runtests: RunTests) -> None:
xml_list = support.junit_xml_list
if xml_list:
- import xml.etree.ElementTree as ET
- result.xml_data = [ET.tostring(x).decode('us-ascii')
- for x in xml_list]
+ result.xml_data = xml_list
finally:
if use_timeout:
faulthandler.cancel_dump_traceback_later()
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index 809abd7e92d65f..17eff617a56aa4 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -473,15 +473,6 @@ def test_verbose3_huntrleaks(self):
self.assertEqual(regrtest.hunt_refleak.runs, 10)
self.assertFalse(regrtest.output_on_failure)
- def test_xml_huntrleaks(self):
- args = ['-R', '3:12', '--junit-xml', 'output.xml']
- with support.captured_stderr():
- regrtest = self.create_regrtest(args)
- self.assertIsNotNone(regrtest.hunt_refleak)
- self.assertEqual(regrtest.hunt_refleak.warmups, 3)
- self.assertEqual(regrtest.hunt_refleak.runs, 12)
- self.assertIsNone(regrtest.junit_filename)
-
@dataclasses.dataclass(slots=True)
class Rerun:
diff --git a/Misc/NEWS.d/next/Tests/2024-05-18-10-59-27.gh-issue-119050.g4qiH7.rst b/Misc/NEWS.d/next/Tests/2024-05-18-10-59-27.gh-issue-119050.g4qiH7.rst
new file mode 100644
index 00000000000000..cfc70c16b2b279
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2024-05-18-10-59-27.gh-issue-119050.g4qiH7.rst
@@ -0,0 +1,2 @@
+regrtest test runner: Add XML support to the refleak checker (-R option).
+Patch by Victor Stinner.
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy