diff options
| author | Milas Bowman <milas.bowman@docker.com> | 2022-07-26 15:48:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 15:48:35 -0400 |
| commit | cf6210316f1e3a72ce8bc5da496249c368c0449d (patch) | |
| tree | 51cd2eabd41baa9d59de1edaf4d0b8d3dcd8ee5f | |
| parent | 2e6dad798324a1d993314f39e9a844b705b61e0d (diff) | |
| parent | 4765f624419c503012508f0fecbe4f63e492cde1 (diff) | |
| download | docker-py-cf6210316f1e3a72ce8bc5da496249c368c0449d.tar.gz | |
Merge pull request #3008 from milas/flaky-tests
test: fix a couple flaky/broken tests
| -rw-r--r-- | tests/integration/api_container_test.py | 2 | ||||
| -rw-r--r-- | tests/integration/regression_test.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py index 062693e..0d6d9f9 100644 --- a/tests/integration/api_container_test.py +++ b/tests/integration/api_container_test.py @@ -1217,12 +1217,14 @@ class AttachContainerTest(BaseAPIIntegrationTest): data = read_exactly(pty_stdout, next_size) assert data.decode('utf-8') == line + @pytest.mark.timeout(10) def test_attach_no_stream(self): container = self.client.create_container( TEST_IMG, 'echo hello' ) self.tmp_containers.append(container) self.client.start(container) + self.client.wait(container, condition='not-running') output = self.client.attach(container, stream=False, logs=True) assert output == 'hello\n'.encode(encoding='ascii') diff --git a/tests/integration/regression_test.py b/tests/integration/regression_test.py index deb9aff..10313a6 100644 --- a/tests/integration/regression_test.py +++ b/tests/integration/regression_test.py @@ -8,6 +8,7 @@ import pytest class TestRegressions(BaseAPIIntegrationTest): + @pytest.mark.xfail(True, reason='Docker API always returns chunked resp') def test_443_handle_nonchunked_response_in_stream(self): dfile = io.BytesIO() with pytest.raises(docker.errors.APIError) as exc: |