diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2012-01-14 10:39:06 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2012-01-14 10:39:06 (GMT) |
| commit | 0e0772d859de7b7424cf4df7a502700e00561f3b (patch) | |
| tree | a7d859755f116ad8169f36a710cee9d22eac8b2d | |
| parent | 138f4656e38f656afa7436c306aa74f1d4941216 (diff) | |
| parent | bcfe56d77ce7da76b10bbd7f8465ec21ea780612 (diff) | |
| download | cpython-0e0772d859de7b7424cf4df7a502700e00561f3b.zip cpython-0e0772d859de7b7424cf4df7a502700e00561f3b.tar.gz cpython-0e0772d859de7b7424cf4df7a502700e00561f3b.tar.bz2 | |
merge from 3.2
| -rwxr-xr-x | Lib/test/regrtest.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index af11416..8e61b03 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -33,7 +33,7 @@ Verbosity -W/--verbose3 -- display test output on failure -d/--debug -- print traceback for failed tests -q/--quiet -- no output unless one or more tests fail --S/--slow -- print the slowest 10 tests +-o/--slow -- print the slowest 10 tests --header -- print header with interpreter info Selecting tests @@ -340,7 +340,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, start = a elif o in ('-s', '--single'): single = True - elif o in ('-S', '--slow'): + elif o in ('-o', '--slow'): print_slow = True elif o in ('-r', '--randomize'): randomize = True @@ -442,6 +442,9 @@ Core and Builtins Library ------- +- Issue #13726: Fix the ambiguous -S flag in regrtest. It is -o/--slow for slow + tests. + - Issue #12364: Fix a hang in concurrent.futures.ProcessPoolExecutor. The hang would occur when retrieving the result of a scheduled future after the executor had been shut down. |