summaryrefslogtreecommitdiffstats
path: root/Lib/test/regrtest.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-07-03 13:07:53 (GMT)
committerGitHub <noreply@github.com>2017-07-03 13:07:53 (GMT)
commitd7955b8196578306e9d86f6c61c9cb3ee72edab0 (patch)
tree58919ecdcaf7a16d5f4b891789387d2b881b2800 /Lib/test/regrtest.py
parentfd93f37f0dc537eb7edca7b75e2f92ef54dd2833 (diff)
downloadcpython-d7955b8196578306e9d86f6c61c9cb3ee72edab0.zip
cpython-d7955b8196578306e9d86f6c61c9cb3ee72edab0.tar.gz
cpython-d7955b8196578306e9d86f6c61c9cb3ee72edab0.tar.bz2
[2.7] bpo-29512, bpo-30764: Backport regrtest enhancements from 3.5 to 2.7 (#2541)
* bpo-29512, bpo-30764: Backport regrtest enhancements from 3.5 to 2.7 * bpo-29512: Add test.bisect, bisect failing tests (#2452) Add a new "python3 -m test.bisect" tool to bisect failing tests. It can be used to find which test method(s) leak references, leak files, etc. * bpo-30764: Fix regrtest --fail-env-changed --forever (#2536) (#2539) --forever now stops if a fail changes the environment. * Fix test_bisect: use absolute import
Diffstat (limited to 'Lib/test/regrtest.py')
-rwxr-xr-xLib/test/regrtest.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index aadbf3b..6852860 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -599,6 +599,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
yield test
if bad:
return
+ if fail_env_changed and environment_changed:
+ return
tests = test_forever()
test_count = ''
test_count_width = 3
@@ -913,7 +915,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
result = "FAILURE"
elif interrupted:
result = "INTERRUPTED"
- elif environment_changed and fail_env_changed:
+ elif fail_env_changed and environment_changed:
result = "ENV CHANGED"
else:
result = "SUCCESS"