summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-11-26 20:19:29 (GMT)
committerGitHub <noreply@github.com>2018-11-26 20:19:29 (GMT)
commit65c216e74f7957006ef7653b7e2afe83007c45ce (patch)
treed1082a6dbbf2c14469aecd81fa1c23555260d59f
parent433433fa6d55091600ce88dd19206b3902e0a87d (diff)
downloadcpython-65c216e74f7957006ef7653b7e2afe83007c45ce.zip
cpython-65c216e74f7957006ef7653b7e2afe83007c45ce.tar.gz
cpython-65c216e74f7957006ef7653b7e2afe83007c45ce.tar.bz2
bpo-33723: Fix test_time.test_thread_time() (GH-10724)
Tolerate up to 30 ms, instead of 15 min, in other threads.
-rw-r--r--Lib/test/test_time.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 16b48a9..381cc82 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -496,7 +496,8 @@ class TimeTestCase(unittest.TestCase):
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
@@ -534,8 +535,11 @@ class TimeTestCase(unittest.TestCase):
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...
@@ -550,7 +554,7 @@ class TimeTestCase(unittest.TestCase):
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)