diff options
Diffstat (limited to 'tests/integration/regression_test.py')
| -rw-r--r-- | tests/integration/regression_test.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/integration/regression_test.py b/tests/integration/regression_test.py index a63883c..10313a6 100644 --- a/tests/integration/regression_test.py +++ b/tests/integration/regression_test.py @@ -2,13 +2,13 @@ import io import random import docker -import six from .base import BaseAPIIntegrationTest, TEST_IMG 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: @@ -39,8 +39,7 @@ class TestRegressions(BaseAPIIntegrationTest): self.client.start(ctnr) self.client.wait(ctnr) logs = self.client.logs(ctnr) - if six.PY3: - logs = logs.decode('utf-8') + logs = logs.decode('utf-8') assert logs == '1000\n' def test_792_explicit_port_protocol(self): @@ -56,10 +55,10 @@ class TestRegressions(BaseAPIIntegrationTest): self.client.start(ctnr) assert self.client.port( ctnr, 2000 - )[0]['HostPort'] == six.text_type(tcp_port) + )[0]['HostPort'] == str(tcp_port) assert self.client.port( ctnr, '2000/tcp' - )[0]['HostPort'] == six.text_type(tcp_port) + )[0]['HostPort'] == str(tcp_port) assert self.client.port( ctnr, '2000/udp' - )[0]['HostPort'] == six.text_type(udp_port) + )[0]['HostPort'] == str(udp_port) |