diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2014-01-02 15:43:09 (GMT) |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2014-01-02 15:43:09 (GMT) |
commit | 393a94243f47fb02c936945e6931427c6adefbcf (patch) | |
tree | 51bc4668e70f6363086dc600b4a3dfe6b112b945 /Lib/test/test_time.py | |
parent | f7f58f8db52a7981dc776a128fcb64657f15406c (diff) | |
parent | 487aedb77c9ef9a7cb5e42ae8b2141f310c5d8ef (diff) | |
download | cpython-393a94243f47fb02c936945e6931427c6adefbcf.zip cpython-393a94243f47fb02c936945e6931427c6adefbcf.tar.gz cpython-393a94243f47fb02c936945e6931427c6adefbcf.tar.bz2 |
Issue #20101: Merge with 3.3
Diffstat (limited to 'Lib/test/test_time.py')
-rw-r--r-- | 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 index bc5f69e..c307bc1 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -384,7 +384,8 @@ 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') |