diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-05-30 16:15:05 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-05-30 16:15:05 (GMT) |
| commit | c6c5e0461174d60b9d8ef35336e9576dbdc6121c (patch) | |
| tree | 1c03f9845997f30aaafb967ba5ec4ec681d86d18 /Lib/test/test_concurrent_futures.py | |
| parent | 758888d437c4c2d398ec322ff1596e1620f5f0dd (diff) | |
| parent | 1ae2998f3edaac9d0e98a62847b5d541f5f50ce0 (diff) | |
| download | cpython-c6c5e0461174d60b9d8ef35336e9576dbdc6121c.zip cpython-c6c5e0461174d60b9d8ef35336e9576dbdc6121c.tar.gz cpython-c6c5e0461174d60b9d8ef35336e9576dbdc6121c.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/test/test_concurrent_futures.py')
| -rw-r--r-- | Lib/test/test_concurrent_futures.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py index ec84a66..7457f39 100644 --- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -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 |