summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-09-21 07:16:31 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-09-21 07:16:31 (GMT)
commit1c56bf0bad6453e6c244ec345ad0eb4d4d1ae15c (patch)
tree8ea99d439fdb6eea1ce2e72a46bcc7c7d1a5682d
parent0c21214f3e583d541227df2239de377e796b55fa (diff)
parent0256f4283987276796129b09905e71a7e3c590d3 (diff)
downloadcpython-1c56bf0bad6453e6c244ec345ad0eb4d4d1ae15c.zip
cpython-1c56bf0bad6453e6c244ec345ad0eb4d4d1ae15c.tar.gz
cpython-1c56bf0bad6453e6c244ec345ad0eb4d4d1ae15c.tar.bz2
Merge 3.5
-rw-r--r--Lib/test/test_asyncio/test_selector_events.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
index f6447cb..70df501 100644
--- a/Lib/test/test_asyncio/test_selector_events.py
+++ b/Lib/test/test_asyncio/test_selector_events.py
@@ -1804,7 +1804,7 @@ class SelectorLoopFunctionalTests(unittest.TestCase):
return buf
def test_sock_connect_sock_write_race(self):
- TIMEOUT = 10.0
+ TIMEOUT = 60.0
PAYLOAD = b'DATA' * 1024 * 1024
class Server(threading.Thread):