Tests: fixed recv_bytes() in websockets.py.

This commit is contained in:
Andrey Zelenkov 2019-09-02 18:03:33 +03:00
parent 790b4f8f00
commit 1cfd329b3d
2 changed files with 3 additions and 11 deletions

View file

@ -386,7 +386,6 @@ class TestNodeWebsockets(TestApplicationNode):
# validation for websocket frames. It should be implemented # validation for websocket frames. It should be implemented
# by application, if necessary. # by application, if necessary.
@unittest.skip('not yet')
def test_node_websockets_1_1_1__1_1_8(self): def test_node_websockets_1_1_1__1_1_8(self):
self.load('websockets/mirror') self.load('websockets/mirror')
@ -413,7 +412,6 @@ class TestNodeWebsockets(TestApplicationNode):
self.close_connection(sock) self.close_connection(sock)
@unittest.skip('not yet')
def test_node_websockets_1_2_1__1_2_8(self): def test_node_websockets_1_2_1__1_2_8(self):
self.load('websockets/mirror') self.load('websockets/mirror')

View file

@ -61,15 +61,9 @@ class TestApplicationWebsocket(TestApplicationProto):
def recv_bytes(sock, bytes): def recv_bytes(sock, bytes):
data = b'' data = b''
while select.select([sock], [], [], read_timeout)[0]: while select.select([sock], [], [], read_timeout)[0]:
try: data += sock.recv(bytes - len(data))
if bytes < 65536:
data = sock.recv(bytes) if len(data) == bytes:
else:
data = self.recvall(
sock, read_timeout=read_timeout, buff_size=bytes
)
break
except:
break break
return data return data