Merge 3.6

This commit is contained in:
Victor Stinner 2016-09-21 09:16:39 +02:00
commit c710362576
1 changed files with 1 additions and 1 deletions

View File

@ -1804,7 +1804,7 @@ class SelectorLoopFunctionalTests(unittest.TestCase):
return buf return buf
def test_sock_connect_sock_write_race(self): def test_sock_connect_sock_write_race(self):
TIMEOUT = 10.0 TIMEOUT = 60.0
PAYLOAD = b'DATA' * 1024 * 1024 PAYLOAD = b'DATA' * 1024 * 1024
class Server(threading.Thread): class Server(threading.Thread):