diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-07-12 09:11:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-12 09:11:29 (GMT) |
| commit | 8df4770e8d2c9ebd49c5e4d073eef3a5bc805cfc (patch) | |
| tree | 7c13a712d89bd1494653888dbdaed88ba20622c8 | |
| parent | 3b06285d2b7963d9d06b60e85712d5ecc6540deb (diff) | |
| download | cpython-8df4770e8d2c9ebd49c5e4d073eef3a5bc805cfc.zip cpython-8df4770e8d2c9ebd49c5e4d073eef3a5bc805cfc.tar.gz cpython-8df4770e8d2c9ebd49c5e4d073eef3a5bc805cfc.tar.bz2 | |
bpo-33716, test_concurrent_futures: increase timeout (GH-7828) (GH-8264)
Increase the timeout from 1 min to 5 min.
Replace also time.time() with time.monotonic() for timeouts.
(cherry picked from commit 3ad8decd76c736f393755537aeb19b5612c21761)
| -rw-r--r-- | Lib/test/test_concurrent_futures.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py index 5ddce09..1ce0c15 100644 --- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -79,7 +79,7 @@ class ExecutorMixin: def setUp(self): super().setUp() - self.t1 = time.time() + self.t1 = time.monotonic() try: self.executor = self.executor_type(max_workers=self.worker_count) except NotImplementedError as e: @@ -90,10 +90,10 @@ class ExecutorMixin: 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() |