From 0b50f2729947b5d72d4922e5a078ad429bf35b0d Mon Sep 17 00:00:00 2001 From: Alexander Brugh Date: Fri, 29 Mar 2019 11:44:58 -0600 Subject: [PATCH 1/2] implementing the revert suggested by @shin- ages ago Signed-off-by: Alexander Brugh --- docker/utils/socket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/utils/socket.py b/docker/utils/socket.py index 7ba9505538..f48b6762fd 100644 --- a/docker/utils/socket.py +++ b/docker/utils/socket.py @@ -27,7 +27,7 @@ def read(socket, n=4096): recoverable_errors = (errno.EINTR, errno.EDEADLK, errno.EWOULDBLOCK) - if six.PY3 and not isinstance(socket, NpipeSocket): + if not isinstance(socket, NpipeSocket): select.select([socket], [], []) try: From b8be61796e848bb38499e8fd395ffec3e62dc2f1 Mon Sep 17 00:00:00 2001 From: Alexander Brugh Date: Tue, 9 Apr 2019 16:00:33 -0600 Subject: [PATCH 2/2] maybe wait a little longer? --- tests/integration/api_container_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py index b364f94c00..d71ced8ef1 100644 --- a/tests/integration/api_container_test.py +++ b/tests/integration/api_container_test.py @@ -1276,7 +1276,7 @@ def test_attach_stream_and_cancel(self): self.client.start(container) output = self.client.attach(container, stream=True, logs=True) - threading.Timer(3, output.close).start() + threading.Timer(5, output.close).start() lines = [] for line in output: