[Python-checkins] bpo-33723: Fix test_time.test_thread_time() (GH-8267)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/4ada0cff5315627eae8208adf0209b479f497b8d
commit: 4ada0cff5315627eae8208adf0209b479f497b8d
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-07-12T07:05:43-07:00
summary:

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.
(cherry picked from commit d6345def68d3a0227253da26213dadb247f786db)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
M Lib/test/test_time.py

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index eda3885ad575..1ebe0cf5684c 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -529,19 +529,24 @@ def test_thread_time(self):
         # 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)