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

test: fix flaky container log test 

Ensure the container has exited before attempting to grab the logs.

Since we are not streaming them, it's possible to attach + grab logs
before the output is processed, resulting in a test failure. If the
container has exited, it's guaranteed to have logged :)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
This commit is contained in:
Milas Bowman 2022-07-26 12:55:14 -04:00
parent 7168e09b16
commit 74e0c5eb8c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/api_container_test.py
View File

@ -1217,12 +1217,14 @@ class AttachContainerTest(BaseAPIIntegrationTest):
data = read_exactly(pty_stdout, next_size) data = read_exactly(pty_stdout, next_size)
assert data.decode('utf-8') == line assert data.decode('utf-8') == line
@pytest.mark.timeout(10)
def test_attach_no_stream(self): def test_attach_no_stream(self):
container = self.client.create_container( container = self.client.create_container(
TEST_IMG, 'echo hello' TEST_IMG, 'echo hello'
) )
self.tmp_containers.append(container) self.tmp_containers.append(container)
self.client.start(container) self.client.start(container)
self.client.wait(container, condition='not-running')
output = self.client.attach(container, stream=False, logs=True) output = self.client.attach(container, stream=False, logs=True)
assert output == 'hello\n'.encode(encoding='ascii') assert output == 'hello\n'.encode(encoding='ascii')