]> granicus.if.org Git - python/commitdiff
Increases some test timeouts to fix issue 11864.
authorBrian Quinlan <brian@sweetapp.com>
Mon, 30 May 2011 11:52:24 +0000 (21:52 +1000)
committerBrian Quinlan <brian@sweetapp.com>
Mon, 30 May 2011 11:52:24 +0000 (21:52 +1000)
Lib/test/test_concurrent_futures.py

index ec84a663079d3f9841147d5b0e2440626704407e..7457f39282a4060f0e3edb1348b3eb49efd1e8f9 100644 (file)
@@ -260,14 +260,14 @@ class WaitTests(unittest.TestCase):
 
     def test_timeout(self):
         future1 = self.executor.submit(mul, 6, 7)
-        future2 = self.executor.submit(time.sleep, 3)
+        future2 = self.executor.submit(time.sleep, 6)
 
         finished, pending = futures.wait(
                 [CANCELLED_AND_NOTIFIED_FUTURE,
                  EXCEPTION_FUTURE,
                  SUCCESSFUL_FUTURE,
                  future1, future2],
-                timeout=1.5,
+                timeout=5,
                 return_when=futures.ALL_COMPLETED)
 
         self.assertEqual(set([CANCELLED_AND_NOTIFIED_FUTURE,
@@ -357,8 +357,8 @@ class ExecutorTest(unittest.TestCase):
         results = []
         try:
             for i in self.executor.map(time.sleep,
-                                       [0, 0, 3],
-                                       timeout=1.5):
+                                       [0, 0, 6],
+                                       timeout=5):
                 results.append(i)
         except futures.TimeoutError:
             pass