[Python-checkins] bpo-33716, test_concurrent_futures: increase timeout (GH-7828)

Thu Jul 12 05:06:00 EDT 2018

https://github.com/python/cpython/commit/b89776fb1b000f73a62850bea78e5b3434bd7e9a
commit: b89776fb1b000f73a62850bea78e5b3434bd7e9a
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018年07月12日T02:05:49-07:00
summary:
bpo-33716, test_concurrent_futures: increase timeout (GH-7828)
Increase the timeout from 1 min to 5 min.
Replace also time.time() with time.monotonic() for timeouts.
(cherry picked from commit 3ad8decd76c736f393755537aeb19b5612c21761)
Co-authored-by: Pablo Galindo <Pablogsal at gmail.com>
files:
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index b258a0eafde6..7e5a4edf80b2 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -109,7 +109,7 @@ class ExecutorMixin:
 def setUp(self):
 super().setUp()
 
- self.t1 = time.time()
+ self.t1 = time.monotonic()
 if hasattr(self, "ctx"):
 self.executor = self.executor_type(
 max_workers=self.worker_count,
@@ -125,10 +125,10 @@ def tearDown(self):
 self.executor.shutdown(wait=True)
 self.executor = None
 
- dt = time.time() - self.t1
+ dt = time.monotonic() - self.t1
 if test.support.verbose:
 print("%.2fs" % dt, end=' ')
- self.assertLess(dt, 60, "synchronization issue: test lasted too long")
+ self.assertLess(dt, 300, "synchronization issue: test lasted too long")
 
 super().tearDown()
 
@@ -240,9 +240,9 @@ def test_initializer(self):
 with self.assertRaises(BrokenExecutor):
 future.result()
 # At some point, the executor should break
- t1 = time.time()
+ t1 = time.monotonic()
 while not self.executor._broken:
- if time.time() - t1 > 5:
+ if time.monotonic() - t1 > 5:
 self.fail("executor not broken after 5 s.")
 time.sleep(0.01)
 # ... and from this point submit() is guaranteed to fail
