summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlysses Souza <ulysses.souza@docker.com>2019-03-26 15:15:40 +0100
committerUlysses Souza <ulysses.souza@docker.com>2019-03-28 14:16:18 +0100
commit33b8fd6eecae3a5dc2c9476a409cf894354bf994 (patch)
treec218bb951d8c6bdfc09bfefa963b2264ef65c240
parentcb8b46260571116dca1da844f9b360fe201194b3 (diff)
downloaddocker-py-33b8fd6eecae3a5dc2c9476a409cf894354bf994.tar.gz
Xfail test_attach_stream_and_cancel on TLS
This test is quite flaky on ssl integration test Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
-rw-r--r--tests/integration/api_container_test.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py
index 83df342..558441e 100644
--- a/tests/integration/api_container_test.py
+++ b/tests/integration/api_container_test.py
@@ -1080,7 +1080,6 @@ class KillTest(BaseAPIIntegrationTest):
class PortTest(BaseAPIIntegrationTest):
def test_port(self):
-
port_bindings = {
'1111': ('127.0.0.1', '4567'),
'2222': ('127.0.0.1', '4568')
@@ -1260,6 +1259,9 @@ class AttachContainerTest(BaseAPIIntegrationTest):
@pytest.mark.timeout(5)
@pytest.mark.skipif(os.environ.get('DOCKER_HOST', '').startswith('ssh://'),
reason='No cancellable streams over SSH')
+ @pytest.mark.xfail(condition=os.environ.get('DOCKER_TLS_VERIFY') or
+ os.environ.get('DOCKER_CERT_PATH'),
+ reason='Flaky test on TLS')
def test_attach_stream_and_cancel(self):
container = self.client.create_container(
BUSYBOX, 'sh -c "echo hello && sleep 60"',