From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 2 Jan 2014 15:43:09 +0000 (-0600)
Subject: Issue #20101: Merge with 3.3
X-Git-Tag: v3.4.0b2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=393a94243f47fb02c936945e6931427c6adefbcf;p=python

Issue #20101: Merge with 3.3
---

393a94243f47fb02c936945e6931427c6adefbcf
diff --cc Lib/test/test_time.py
index bc5f69e031,ae3113a04a..c307bc19ba
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@@ -384,9 -376,9 +384,10 @@@ class TimeTestCase(unittest.TestCase)
          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')
          self.assertTrue(info.monotonic)
          self.assertFalse(info.adjustable)