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

[zach.ware]

http://hg.python.org/cpython/rev/e2a1400b7db9
changeset:   88255:e2a1400b7db9
parent:      88253:70fd3383bd31
parent:      88254:82df66a091da
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Thu Jan 02 09:43:09 2014 -0600
summary:
  Issue #20101: Merge with 3.3

files:
  Lib/test/test_time.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -384,7 +384,8 @@
         t2 = time.monotonic()
         dt = t2 - t1
         self.assertGreater(t2, t1)
-        self.assertTrue(0.5 <= dt <= 1.0, dt)
+        # Issue #20101: On some Windows machines, dt may be slightly low
+        self.assertTrue(0.45 <= dt <= 1.0, dt)
 
         # monotonic() is a monotonic but non adjustable clock
         info = time.get_clock_info('monotonic')

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