Merge 3.6

2016-09-21 09:16:39 +02:00 · 2016-09-21 09:16:39 +02:00 · c710362576
parent 637d1e2b0a 1c56bf0bad
commit c710362576
1 changed files with 1 additions and 1 deletions
--- 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):