]> granicus.if.org Git - python/commitdiff
Issue #20101: Merge with 3.3
authorZachary Ware <zachary.ware@gmail.com>
Thu, 2 Jan 2014 15:43:09 +0000 (09:43 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 2 Jan 2014 15:43:09 +0000 (09:43 -0600)
1  2 
Lib/test/test_time.py

index bc5f69e03127731dcee2fdcae1becba6885f7723,ae3113a04afb236bc5e74eedb023c73119820ad5..c307bc19baaf9dbb4d2989beaa26c0ba1c273ad3
@@@ -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)