[Python-checkins] bpo-33723: Fix test_time.test_thread_time() (GH-10724)
Miss Islington (bot)
webhook-mailer at python.org
Mon Nov 26 15:36:59 EST 2018
https://github.com/python/cpython/commit/5350dd1b50e60882a2da6d53ed27e02d2b698f2e
commit: 5350dd1b50e60882a2da6d53ed27e02d2b698f2e
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-11-26T12:36:54-08:00
summary:
bpo-33723: Fix test_time.test_thread_time() (GH-10724)
Tolerate up to 30 ms, instead of 15 min, in other threads.
(cherry picked from commit 65c216e74f7957006ef7653b7e2afe83007c45ce)
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 62abd891aafa..b9c678640808 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -497,7 +497,8 @@ def test_process_time(self):
self.assertLess(stop - start, 0.020)
# bpo-33723: A busy loop of 100 ms should increase process_time()
- # by at least 15 ms
+ # by at least 15 ms. Tolerate 15 ms because of the bad resolution of
+ # the clock on Windows (around 15.6 ms).
min_time = 0.015
busy_time = 0.100
@@ -535,8 +536,11 @@ def test_thread_time(self):
self.assertLess(stop - start, 0.020)
# bpo-33723: A busy loop of 100 ms should increase thread_time()
- # by at least 15 ms
+ # by at least 15 ms, but less than 30 ms in other threads.
+ # Tolerate 15 and 30 ms because of the bad resolution
+ # of the clock on Windows (around 15.6 ms).
min_time = 0.015
+ max_time = 0.030
busy_time = 0.100
# thread_time() should include CPU time spent in current thread...
@@ -551,7 +555,7 @@ def test_thread_time(self):
t.start()
t.join()
stop = time.thread_time()
- self.assertLess(stop - start, min_time)
+ self.assertLess(stop - start, max_time)
info = time.get_clock_info('thread_time')
self.assertTrue(info.monotonic)
More information about the Python-checkins
mailing list