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 #3008 from milas/flaky-tests 

test: fix a couple flaky/broken tests
This commit is contained in:
Milas Bowman 2022-07-26 15:48:35 -04:00 committed by GitHub
parent 2e6dad7983 4765f62441
commit cf6210316f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 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')

1
tests/integration/regression_test.py
View File

@ -8,6 +8,7 @@ import pytest
class TestRegressions(BaseAPIIntegrationTest): class TestRegressions(BaseAPIIntegrationTest):
@pytest.mark.xfail(True, reason='Docker API always returns chunked resp')
def test_443_handle_nonchunked_response_in_stream(self): def test_443_handle_nonchunked_response_in_stream(self):
dfile = io.BytesIO() dfile = io.BytesIO()
with pytest.raises(docker.errors.APIError) as exc: with pytest.raises(docker.errors.APIError) as exc: