Tests: read_timeout option introduced.

Also, increased default select() timeout from 1s to 5s.
This commit is contained in:
Andrey Zelenkov
2019-02-27 19:43:14 +03:00
parent 4de2c8b567
commit bd77c9a4d2
3 changed files with 16 additions and 13 deletions

View File

@@ -357,7 +357,8 @@ class TestUnitHTTP(TestUnit):
if 'no_recv' not in kwargs:
enc = 'utf-8' if 'encoding' not in kwargs else kwargs['encoding']
resp = self.recvall(sock).decode(enc)
read_timeout = 5 if 'read_timeout' not in kwargs else kwargs['read_timeout']
resp = self.recvall(sock, read_timeout=read_timeout).decode(enc)
if TestUnit.detailed:
print('<<<', resp.encode('utf-8'), sep='\n')
@@ -383,9 +384,9 @@ class TestUnitHTTP(TestUnit):
def put(self, **kwargs):
return self.http('PUT', **kwargs)
def recvall(self, sock, buff_size=4096):
def recvall(self, sock, read_timeout=5, buff_size=4096):
data = b''
while select.select([sock], [], [], 1)[0]:
while select.select([sock], [], [], read_timeout)[0]:
try:
part = sock.recv(buff_size)
except: