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

Streaming TTY messages sometimes get truncated. Handle gracefully in demux tests 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2019-05-01 00:59:35 -07:00
parent 992e0dcdfb
commit 34ffc56865
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/integration/api_exec_test.py
View File

@ -304,9 +304,13 @@ class ExecDemuxTest(BaseAPIIntegrationTest):
# tty=True, stream=True, demux=False # tty=True, stream=True, demux=False
res = self.client.exec_create(self.container, self.cmd, tty=True) res = self.client.exec_create(self.container, self.cmd, tty=True)
exec_log = list(self.client.exec_start(res, stream=True)) exec_log = list(self.client.exec_start(res, stream=True))
assert len(exec_log) == 2
assert b'hello out\r\n' in exec_log assert b'hello out\r\n' in exec_log
assert b'hello err\r\n' in exec_log if len(exec_log) == 2:
assert b'hello err\r\n' in exec_log
else:
assert len(exec_log) == 3
assert b'hello err' in exec_log
assert b'\r\n' in exec_log
def test_exec_command_tty_no_stream_demux(self): def test_exec_command_tty_no_stream_demux(self):
# tty=True, stream=False, demux=True # tty=True, stream=False, demux=True
@ -318,6 +322,10 @@ class ExecDemuxTest(BaseAPIIntegrationTest):
# tty=True, stream=True, demux=True # tty=True, stream=True, demux=True
res = self.client.exec_create(self.container, self.cmd, tty=True) res = self.client.exec_create(self.container, self.cmd, tty=True)
exec_log = list(self.client.exec_start(res, demux=True, stream=True)) exec_log = list(self.client.exec_start(res, demux=True, stream=True))
assert len(exec_log) == 2
assert (b'hello out\r\n', None) in exec_log assert (b'hello out\r\n', None) in exec_log
assert (b'hello err\r\n', None) in exec_log if len(exec_log) == 2:
assert (b'hello err\r\n', None) in exec_log
else:
assert len(exec_log) == 3
assert (b'hello err', None) in exec_log
assert (b'\r\n', None) in exec_log