diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py index 4f12176ced5c87..ab59d8123013da 100644 --- a/Lib/test/libregrtest/runtest.py +++ b/Lib/test/libregrtest/runtest.py @@ -249,6 +249,12 @@ def iter_tests(self): else: yield from self.tests + @staticmethod + def from_json_dict(json_dict): + if json_dict['hunt_refleak']: + json_dict['hunt_refleak'] = HuntRefleak(**json_dict['hunt_refleak']) + return RunTests(**json_dict) + # Minimum duration of a test to display its duration or to mention that # the test is running in background diff --git a/Lib/test/libregrtest/runtest_mp.py b/Lib/test/libregrtest/runtest_mp.py index 4bff7f99964119..4e3148fa8e2e67 100644 --- a/Lib/test/libregrtest/runtest_mp.py +++ b/Lib/test/libregrtest/runtest_mp.py @@ -68,7 +68,7 @@ def default(self, o: Any) -> dict[str, Any]: def _decode_worker_job(d: dict[str, Any]) -> WorkerJob | dict[str, Any]: if "__worker_job__" in d: d.pop('__worker_job__') - d['runtests'] = RunTests(**d['runtests']) + d['runtests'] = RunTests.from_json_dict(d['runtests']) return WorkerJob(**d) if "__namespace__" in d: d.pop('__namespace__') diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index 8cced1f5185c2f..23896fdedaccac 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -1018,12 +1018,16 @@ def test_run(self): stats=TestStats(4, 1), forever=True) - def check_leak(self, code, what): + def check_leak(self, code, what, *, multiprocessing=False): test = self.create_test('huntrleaks', code=code) filename = 'reflog.txt' self.addCleanup(os_helper.unlink, filename) - output = self.run_tests('--huntrleaks', '6:3:', test, + cmd = ['--huntrleaks', '6:3:'] + if multiprocessing: + cmd.append('-j1') + cmd.append(test) + output = self.run_tests(*cmd, exitcode=EXITCODE_BAD_TEST, stderr=subprocess.STDOUT) self.check_executed_tests(output, [test], failed=test, stats=1) @@ -1039,7 +1043,7 @@ def check_leak(self, code, what): self.assertIn(line2, reflog) @unittest.skipUnless(support.Py_DEBUG, 'need a debug build') - def test_huntrleaks(self): + def check_huntrleaks(self, *, multiprocessing: bool): # test --huntrleaks code = textwrap.dedent(""" import unittest @@ -1050,7 +1054,13 @@ class RefLeakTest(unittest.TestCase): def test_leak(self): GLOBAL_LIST.append(object()) """) - self.check_leak(code, 'references') + self.check_leak(code, 'references', multiprocessing=multiprocessing) + + def test_huntrleaks(self): + self.check_huntrleaks(multiprocessing=False) + + def test_huntrleaks_mp(self): + self.check_huntrleaks(multiprocessing=True) @unittest.skipUnless(support.Py_DEBUG, 'need a debug build') def test_huntrleaks_fd_leak(self):