summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBrian Quinlan <brian@sweetapp.com>2010-11-20 04:09:35 (GMT)
committerBrian Quinlan <brian@sweetapp.com>2010-11-20 04:09:35 (GMT)
commitb304d0b46f69b16f73b429293a606253cc4c35d3 (patch)
tree75c4e148e71fdddadb057ef75331dada14798da5 /Lib/test
parent722b5fdbb872997e9fbfecd480de976a782412e5 (diff)
downloadcpython-b304d0b46f69b16f73b429293a606253cc4c35d3.zip
cpython-b304d0b46f69b16f73b429293a606253cc4c35d3.tar.gz
cpython-b304d0b46f69b16f73b429293a606253cc4c35d3.tar.bz2
Fixes a timing-related failure on Windows (issue 10183)
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_concurrent_futures.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index 6427368..85e47d8 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -75,7 +75,7 @@ class Call(object):
def _wait_on_event(self, handle):
if sys.platform.startswith('win'):
- r = ctypes.windll.kernel32.WaitForSingleObject(handle, 5 * 1000)
+ r = ctypes.windll.kernel32.WaitForSingleObject(handle, 60 * 1000)
assert r == 0
else:
self.CALL_LOCKS[handle].wait()
@@ -433,7 +433,7 @@ class WaitTests(unittest.TestCase):
EXCEPTION_FUTURE,
SUCCESSFUL_FUTURE,
future1, future2],
- timeout=1,
+ timeout=5,
return_when=futures.ALL_COMPLETED)
self.assertEquals(set([CANCELLED_AND_NOTIFIED_FUTURE,
@@ -560,7 +560,7 @@ class ExecutorTest(unittest.TestCase):
try:
for i in self.executor.map(timeout_call,
[False, False, True],
- timeout=1):
+ timeout=5):
results.append(i)
except futures.TimeoutError:
pass