summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2019-05-01 00:47:16 -0700
committerJoffrey F <joffrey@docker.com>2019-05-01 00:47:16 -0700
commit62c8bcbbb600cbe26e3e12ed95207ffe63c40fc8 (patch)
tree78b771da47263a1e7b2dcab2cd4bfa6e48857ee0
parenta2a2d100e841b7bb37b9c3d805ca25260f0b3bda (diff)
downloaddocker-py-fix_socket_detach_helper.tar.gz
Increase timeout on test with long sleepsfix_socket_detach_helper
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--tests/integration/api_container_test.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py
index 730c9ee..9b770c7 100644
--- a/tests/integration/api_container_test.py
+++ b/tests/integration/api_container_test.py
@@ -1251,7 +1251,7 @@ class AttachContainerTest(BaseAPIIntegrationTest):
output = self.client.attach(container, stream=False, logs=True)
assert output == 'hello\n'.encode(encoding='ascii')
- @pytest.mark.timeout(5)
+ @pytest.mark.timeout(10)
@pytest.mark.skipif(os.environ.get('DOCKER_HOST', '').startswith('ssh://'),
reason='No cancellable streams over SSH')
def test_attach_stream_and_cancel(self):