[Python-checkins] cpython (merge 3.5 -> 3.6): Merge 3.5

[victor.stinner]

https://hg.python.org/cpython/rev/cc88969d55ba
changeset:   103980:cc88969d55ba
branch:      3.6
parent:      103977:278b21d8e86e
parent:      103979:06efc625578a
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Sep 21 09:16:31 2016 +0200
summary:
  Merge 3.5

files:
  Lib/test/test_asyncio/test_selector_events.py |  2 +-
  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
--- a/Lib/test/test_asyncio/test_selector_events.py
+++ b/Lib/test/test_asyncio/test_selector_events.py
@@ -1804,7 +1804,7 @@
         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):

-- 
Repository URL: https://hg.python.org/cpython