[Python-checkins] cpython (merge 3.3 -> default): Issue #18375: merge with 3.3

[florent.xicluna]

http://hg.python.org/cpython/rev/7be081fa8db1
changeset:   84456:7be081fa8db1
parent:      84454:ae8b054155c1
parent:      84455:5bd3f9ed357e
user:        Florent Xicluna <florent.xicluna at gmail.com>
date:        Sat Jul 06 12:27:50 2013 +0200
summary:
  Issue #18375: merge with 3.3

files:
  Lib/test/regrtest.py |  1 +
  Misc/NEWS            |  3 +++
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -428,6 +428,7 @@
         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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -468,6 +468,9 @@
 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

-- 
Repository URL: http://hg.python.org/cpython