bpo-30764: Fix regrtest --fail-env-changed --forever (#2536) (#2539)

vstinner · web-flow · commit 4132adb4b8f9 · 2017-07-03T12:50:36.000+02:00
--forever now stops if a fail changes the environment. (cherry picked from commit 5e87592)
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
@@ -415,6 +415,8 @@ def _test_forever(self, tests):
                 yield test
                 if self.bad:
                     return
+                if self.ns.fail_env_changed and self.environment_changed:
+                    return
 
     def display_header(self):
         # Print basic platform information
@@ -478,7 +480,7 @@ def finalize(self):
             result = "FAILURE"
         elif self.interrupted:
             result = "INTERRUPTED"
-        elif self.environment_changed and self.ns.fail_env_changed:
+        elif self.ns.fail_env_changed and self.environment_changed:
             result = "ENV CHANGED"
         else:
             result = "SUCCESS"
