summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2013-07-06 10:27:50 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2013-07-06 10:27:50 (GMT)
commit8624ed502ff5ff1ccaf5fba58e945611e6758d97 (patch)
treed1beb8a134ec7eb19d86198771ea13a514c74bf2
parentc17d0c2218133109740e554abac26bf3345aaa3f (diff)
parentd9e7c86d7e0593c13155c1b6c47c4e64fdbc39ac (diff)
downloadcpython-8624ed502ff5ff1ccaf5fba58e945611e6758d97.zip
cpython-8624ed502ff5ff1ccaf5fba58e945611e6758d97.tar.gz
cpython-8624ed502ff5ff1ccaf5fba58e945611e6758d97.tar.bz2
Issue #18375: merge with 3.3
-rwxr-xr-xLib/test/regrtest.py1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index aad0c62..c8bbcb2 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -428,6 +428,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
elif o in ('-r', '--randomize'):
randomize = True
elif o == '--randseed':
+ randomize = True
random_seed = int(a)
elif o in ('-f', '--fromfile'):
fromfile = a
diff --git a/Misc/NEWS b/Misc/NEWS
index f3a099d..564590c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -468,6 +468,9 @@ Library
Tests
-----
+- Issue #18375: Assume --randomize when --randseed is used for running the
+ testsuite.
+
- Issue #11185: Fix test_wait4 under AIX. Patch by Sébastien Sablé.
- Issue #18207: Fix test_ssl for some versions of OpenSSL that ignore seconds