Merge 3.5

This commit is contained in:
Victor Stinner 2016-09-21 09:16:31 +02:00
commit 1c56bf0bad

View file

@ -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):