docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix socket tests for TLS-enabled tests 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-03-15 14:36:39 -07:00 committed by Joffrey F
parent 16ccf377a3
commit 884261e241
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/helpers.py
View File

@ -108,21 +108,21 @@ def swarm_listen_addr():
def assert_cat_socket_detached_with_keys(sock, inputs):
if six.PY3:
if six.PY3 and hasattr(sock, '_sock'):
sock = sock._sock
for i in inputs:
sock.send(i)
sock.sendall(i)
time.sleep(0.5)
# If we're using a Unix socket, the sock.send call will fail with a
# BrokenPipeError ; INET sockets will just stop receiving / sending data
# but will not raise an error
if sock.family == getattr(socket, 'AF_UNIX', -1):
if getattr(sock, 'family', -9) == getattr(socket, 'AF_UNIX', -1):
with pytest.raises(socket.error):
sock.send(b'make sure the socket is closed\n')
sock.sendall(b'make sure the socket is closed\n')
else:
sock.send(b"make sure the socket is closed\n")
sock.sendall(b"make sure the socket is closed\n")
assert sock.recv(32) == b''