diff options
author | Joffrey F <joffrey@docker.com> | 2018-03-15 14:36:39 -0700 |
---|---|---|
committer | Joffrey F <joffrey@docker.com> | 2018-03-20 09:49:40 +0100 |
commit | 311b62225a72c19767d0545e9a0414924f9b6abe (patch) | |
tree | e0fb42b3ab423e575dafa447e0d4d8bbf5e34d65 | |
parent | 4963491ef8958ec4842dd8cc44b8d5b8fce1938c (diff) | |
download | docker-py-311b62225a72c19767d0545e9a0414924f9b6abe.tar.gz |
Fix socket tests for TLS-enabled tests
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r-- | tests/helpers.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/helpers.py b/tests/helpers.py index c4ea364..b6b493b 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -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'' |