]> granicus.if.org Git - python/commitdiff
bpo-33716, test_concurrent_futures: increase timeout (GH-7828)
authorPablo Galindo <Pablogsal@gmail.com>
Thu, 21 Jun 2018 11:30:37 +0000 (12:30 +0100)
committerGitHub <noreply@github.com>
Thu, 21 Jun 2018 11:30:37 +0000 (12:30 +0100)
Increase the timeout from 1 min to 5 min.

Replace also time.time() with time.monotonic() for timeouts.

Lib/test/test_concurrent_futures.py

index f2c28ac12b1d09b660862b9829925bf172cb2e9a..01125c79ba575e1773e9ffeca88640813afd3c5e 100644 (file)
@@ -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 @@ 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()
 
@@ -240,9 +240,9 @@ class FailingInitializerMixin(ExecutorMixin):
                 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