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

[zach.ware]

http://hg.python.org/cpython/rev/28ec217ce510
changeset:   87598:28ec217ce510
parent:      87592:08bcbc210a0f
parent:      87597:c65882d79c5f
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Nov 26 14:54:21 2013 -0600
summary:
  Issue #19588: Merge with 3.3

files:
  Lib/test/test_random.py |  12 ++++++------
  Misc/ACKS               |   1 +
  Misc/NEWS               |   6 ++++++
  3 files changed, 13 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -240,10 +240,10 @@
 
     def test_bigrand_ranges(self):
         for i in [40,80, 160, 200, 211, 250, 375, 512, 550]:
-            start = self.gen.randrange(2 ** i)
-            stop = self.gen.randrange(2 ** (i-2))
+            start = self.gen.randrange(2 ** (i-2))
+            stop = self.gen.randrange(2 ** i)
             if stop <= start:
-                return
+                continue
             self.assertTrue(start <= self.gen.randrange(start, stop) < stop)
 
     def test_rangelimits(self):
@@ -432,10 +432,10 @@
 
     def test_bigrand_ranges(self):
         for i in [40,80, 160, 200, 211, 250, 375, 512, 550]:
-            start = self.gen.randrange(2 ** i)
-            stop = self.gen.randrange(2 ** (i-2))
+            start = self.gen.randrange(2 ** (i-2))
+            stop = self.gen.randrange(2 ** i)
             if stop <= start:
-                return
+                continue
             self.assertTrue(start <= self.gen.randrange(start, stop) < stop)
 
     def test_rangelimits(self):
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -449,6 +449,7 @@
 Jonathan Giddy
 Johannes Gijsbers
 Michael Gilfix
+Julian Gindi
 Yannick Gingras
 Matt Giuca
 Wim Glenn
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,12 @@
 - Issue #19545: Avoid chained exceptions while passing stray % to
   time.strptime().  Initial patch by Claudiu Popa.
 
+Tests
+-----
+
+- Issue #19588: Fixed tests in test_random that were silently skipped most
+  of the time.  Patch by Julian Gindi.
+
 
 What's New in Python 3.4.0 Beta 1?
 ==================================

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