diff options
author | Joffrey F <joffrey@docker.com> | 2017-08-16 17:31:36 -0700 |
---|---|---|
committer | Joffrey F <joffrey@docker.com> | 2017-08-16 18:13:12 -0700 |
commit | 7bf11c93ba9ffa7be228aa0a0c62155c6fc80e35 (patch) | |
tree | 3c0f9f4223bd727171079673de846fa002cca1ab /tests | |
parent | 6f6c29ce36128d712109ff27d557d67dae087da3 (diff) | |
download | docker-py-fix_upgraded_tty_streams.tar.gz |
Fix handling of non-multiplexed (TTY) streams over upgraded socketsfix_upgraded_tty_streams
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/integration/api_build_test.py | 2 | ||||
-rw-r--r-- | tests/unit/api_test.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/integration/api_build_test.py b/tests/integration/api_build_test.py index 209c1f2..d0aa5c2 100644 --- a/tests/integration/api_build_test.py +++ b/tests/integration/api_build_test.py @@ -244,8 +244,8 @@ class BuildTest(BaseAPIIntegrationTest): with pytest.raises(errors.NotFound): self.client.inspect_image('dockerpytest_nonebuild') + @requires_experimental(until=None) @requires_api_version('1.25') - @requires_experimental def test_build_squash(self): script = io.BytesIO('\n'.join([ 'FROM busybox', diff --git a/tests/unit/api_test.py b/tests/unit/api_test.py index 83848c5..6ac92c4 100644 --- a/tests/unit/api_test.py +++ b/tests/unit/api_test.py @@ -83,7 +83,7 @@ def fake_delete(self, url, *args, **kwargs): return fake_request('DELETE', url, *args, **kwargs) -def fake_read_from_socket(self, response, stream): +def fake_read_from_socket(self, response, stream, tty=False): return six.binary_type() |