summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Selivanov <yury@magic.io>2018-01-29 05:25:05 (GMT)
committerGitHub <noreply@github.com>2018-01-29 05:25:05 (GMT)
commit1e5b25b8c0c45ccfd58da2cb82fdf231c6823fef (patch)
treeacb3fbb33a26783ebebedb93a3312de9f437faba
parent07627e9a6a5f418354ff3dc99a0f36bc5b79dcd8 (diff)
downloadcpython-1e5b25b8c0c45ccfd58da2cb82fdf231c6823fef.zip
cpython-1e5b25b8c0c45ccfd58da2cb82fdf231c6823fef.tar.gz
cpython-1e5b25b8c0c45ccfd58da2cb82fdf231c6823fef.tar.bz2
bpo-23749: Make start-tls tests more stable on win7 buildbot (GH-5409)
To mitigate the situation when the buildbot is under load and is unable to send/receive data fast enough: * reduce the size of the payload * set a generous timeout for socket ops
-rw-r--r--Lib/test/test_asyncio/test_sslproto.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 475f494..c4c30be 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -2,6 +2,7 @@
import os
import logging
+import time
import unittest
from unittest import mock
try:
@@ -171,12 +172,14 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
raise NotImplementedError
def test_start_tls_client_1(self):
- HELLO_MSG = b'1' * 1024 * 1024 * 5
+ HELLO_MSG = b'1' * 1024 * 1024
server_context = test_utils.simple_server_sslcontext()
client_context = test_utils.simple_client_sslcontext()
def serve(sock):
+ sock.settimeout(5)
+
data = sock.recv_all(len(HELLO_MSG))
self.assertEqual(len(data), len(HELLO_MSG))
@@ -205,6 +208,8 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
self.on_eof.set_result(True)
async def client(addr):
+ await asyncio.sleep(0.5, loop=self.loop)
+
on_data = self.loop.create_future()
on_eof = self.loop.create_future()
@@ -225,12 +230,15 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
asyncio.wait_for(client(srv.addr), loop=self.loop, timeout=10))
def test_start_tls_server_1(self):
- HELLO_MSG = b'1' * 1024 * 1024 * 5
+ HELLO_MSG = b'1' * 1024 * 1024
server_context = test_utils.simple_server_sslcontext()
client_context = test_utils.simple_client_sslcontext()
def client(sock, addr):
+ time.sleep(0.5)
+ sock.settimeout(5)
+
sock.connect(addr)
data = sock.recv_all(len(HELLO_MSG))
self.assertEqual(len(data), len(HELLO_MSG))