diff --git a/Lib/test/libregrtest/results.py b/Lib/test/libregrtest/results.py index 6e7d65880f7347..03ee985508a9c6 100644 --- a/Lib/test/libregrtest/results.py +++ b/Lib/test/libregrtest/results.py @@ -25,7 +25,7 @@ def __init__(self): self.env_changed: TestList = [] self.run_no_tests: TestList = [] self.rerun: TestList = [] - self.bad_results: list[TestResult] = [] + self.rerun_results: list[TestResult] = [] self.interrupted: bool = False self.test_times: list[tuple[float, TestName]] = [] @@ -82,6 +82,7 @@ def accumulate_result(self, result: TestResult, runtests: RunTests): self.good.append(test_name) case State.ENV_CHANGED: self.env_changed.append(test_name) + self.rerun_results.append(result) case State.SKIPPED: self.skipped.append(test_name) case State.RESOURCE_DENIED: @@ -93,7 +94,7 @@ def accumulate_result(self, result: TestResult, runtests: RunTests): case _: if result.is_failed(fail_env_changed): self.bad.append(test_name) - self.bad_results.append(result) + self.rerun_results.append(result) else: raise ValueError(f"invalid test state: {result.state!r}") @@ -109,12 +110,12 @@ def accumulate_result(self, result: TestResult, runtests: RunTests): self.add_junit(xml_data) def need_rerun(self): - return bool(self.bad_results) + return bool(self.rerun_results) def prepare_rerun(self) -> tuple[TestTuple, FilterDict]: tests: TestList = [] match_tests_dict = {} - for result in self.bad_results: + for result in self.rerun_results: tests.append(result.test_name) match_tests = result.get_rerun_match_tests() @@ -125,7 +126,8 @@ def prepare_rerun(self) -> tuple[TestTuple, FilterDict]: # Clear previously failed tests self.rerun_bad.extend(self.bad) self.bad.clear() - self.bad_results.clear() + self.env_changed.clear() + self.rerun_results.clear() return (tuple(tests), match_tests_dict) diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index 408e667fffa0f0..4bdf014af27fb9 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -463,7 +463,7 @@ def check_executed_tests(self, output, tests, *, stats, randomize = True rerun_failed = [] - if rerun is not None: + if rerun is not None and not env_changed: failed = [rerun.name] if not rerun.success: rerun_failed.append(rerun.name) @@ -590,7 +590,7 @@ def list_regex(line_format, tests): state = ', '.join(state) if rerun is not None: new_state = 'SUCCESS' if rerun.success else 'FAILURE' - state = 'FAILURE then ' + new_state + state = f'{state} then {new_state}' self.check_line(output, f'Result: {state}', full=True) def parse_random_seed(self, output): @@ -1228,6 +1228,15 @@ def test_env_changed(self): self.check_executed_tests(output, [testname], env_changed=testname, fail_env_changed=True, stats=1) + # rerun + output = self.run_tests("--rerun", testname) + self.check_executed_tests(output, [testname], + env_changed=testname, + rerun=Rerun(testname, + match=None, + success=True), + stats=2) + def test_rerun_fail(self): # FAILURE then FAILURE code = textwrap.dedent(""" diff --git a/Misc/NEWS.d/next/Tests/2023-09-25-14-41-18.gh-issue-109276.uC_cWo.rst b/Misc/NEWS.d/next/Tests/2023-09-25-14-41-18.gh-issue-109276.uC_cWo.rst new file mode 100644 index 00000000000000..66651cf6f4b966 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2023-09-25-14-41-18.gh-issue-109276.uC_cWo.rst @@ -0,0 +1,3 @@ +regrtest: When a test fails with "env changed" and the --rerun option is +used, the test is now re-run in verbose mode in a fresh process. Patch by +Victor Stinner.