Skip to content

Commit 4132adb

Browse files
authored
bpo-30764: Fix regrtest --fail-env-changed --forever (#2536) (#2539)
--forever now stops if a fail changes the environment. (cherry picked from commit 5e87592)
1 parent bfdc6fd commit 4132adb

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Lib/test/libregrtest/main.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,8 @@ def _test_forever(self, tests):
415415
yield test
416416
if self.bad:
417417
return
418+
if self.ns.fail_env_changed and self.environment_changed:
419+
return
418420

419421
def display_header(self):
420422
# Print basic platform information
@@ -478,7 +480,7 @@ def finalize(self):
478480
result = "FAILURE"
479481
elif self.interrupted:
480482
result = "INTERRUPTED"
481-
elif self.environment_changed and self.ns.fail_env_changed:
483+
elif self.ns.fail_env_changed and self.environment_changed:
482484
result = "ENV CHANGED"
483485
else:
484486
result = "SUCCESS"

0 commit comments

Comments
 (0)