diff options
author | Victor Stinner <vstinner@redhat.com> | 2018-07-12 13:25:22 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-12 13:25:22 (GMT) |
commit | d6345def68d3a0227253da26213dadb247f786db (patch) | |
tree | 9e688825b2b244e531b4f395a111fa611f3b4bd5 | |
parent | 9e9b2c32a34594e901b5b9a03c561a2a2bf63ece (diff) | |
download | cpython-d6345def68d3a0227253da26213dadb247f786db.zip cpython-d6345def68d3a0227253da26213dadb247f786db.tar.gz cpython-d6345def68d3a0227253da26213dadb247f786db.tar.bz2 |
bpo-33723: Fix test_time.test_thread_time() (GH-8267)
The test failed on AMD64 Debian root 3.x buildbot because the busy
loop of 100 ms only increased time.thread_time() by 19.9 ms which is
smaller than 20 ms. Modify the test to tolerate a delta of at least
15 ms instead of 20 ms.
-rw-r--r-- | Lib/test/test_time.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index eda3885..1ebe0cf 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -529,19 +529,24 @@ class TimeTestCase(unittest.TestCase): # on Windows self.assertLess(stop - start, 0.020) + # bpo-33723: A busy loop of 100 ms should increase thread_time() + # by at least 15 ms + min_time = 0.015 + busy_time = 0.100 + # thread_time() should include CPU time spent in current thread... start = time.thread_time() - busy_wait(0.100) + busy_wait(busy_time) stop = time.thread_time() - self.assertGreaterEqual(stop - start, 0.020) # machine busy? + self.assertGreaterEqual(stop - start, min_time) # ...but not in other threads - t = threading.Thread(target=busy_wait, args=(0.100,)) + t = threading.Thread(target=busy_wait, args=(busy_time,)) start = time.thread_time() t.start() t.join() stop = time.thread_time() - self.assertLess(stop - start, 0.020) + self.assertLess(stop - start, min_time) info = time.get_clock_info('thread_time') self.assertTrue(info.monotonic) |