Skip to content

implementing the revert suggested by @shin- ages ago #2300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

implementing the revert suggested by @shin- ages ago #2300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b50f27
implementing the revert suggested by @shin- ages ago
Mar 29, 2019
b8be617
maybe wait a little longer?
abrugh Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/utils/socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/api_container_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down