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

Merge pull request #2071 from docker/1806-detach-fix 

Fix detach assert function to account for new behavior in engine 18.06
This commit is contained in:
Joffrey F 2018-06-28 17:11:00 -07:00 committed by GitHub
parent dd9cff4f03 e195e022cf
commit 101214e5de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/helpers.py
View File

@ -123,7 +123,12 @@ def assert_cat_socket_detached_with_keys(sock, inputs):
sock.sendall(b'make sure the socket is closed\n') sock.sendall(b'make sure the socket is closed\n')
else: else:
sock.sendall(b"make sure the socket is closed\n") sock.sendall(b"make sure the socket is closed\n")
assert sock.recv(32) == b'' data = sock.recv(128)
# New in 18.06: error message is broadcast over the socket when reading
# after detach
assert data == b'' or data.startswith(
b'exec attach failed: error on attach stdin: read escape sequence'
)
def ctrl_with(char): def ctrl_with(char):