From 52ec6609360c488ca5a9d0bc3ba90fa29cdc2684 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 9 Aug 2019 18:51:29 +0200 Subject: [PATCH] docker-py: deselect broken experimental tests These tests are fixed upstream, but those fixes are not yet in a released version. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit f8cde0b32d86fa2df71ec65adc3d45f862b3ea33) Signed-off-by: Sebastiaan van Stijn --- hack/make/test-docker-py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hack/make/test-docker-py b/hack/make/test-docker-py index 2dc55a5454..41052a68ac 100644 --- a/hack/make/test-docker-py +++ b/hack/make/test-docker-py @@ -10,8 +10,14 @@ source hack/make/.integration-test-helpers : ${DOCKER_PY_COMMIT:=4.0.2} # custom options to pass py.test -# TODO remove these skip once we update to a docker-py version that has https://github.com/docker/docker-py/pull/2369 and https://github.com/docker/docker-py/pull/2380 -: ${PY_TEST_OPTIONS:="--deselect=tests/integration/api_swarm_test.py::SwarmTest::test_init_swarm_data_path_addr --deselect=tests/integration/api_exec_test.py::ExecTest::test_detach_with_arg --deselect=tests/integration/api_exec_test.py::ExecDemuxTest::test_exec_command_tty_stream_no_demux"} +# TODO remove these skip once we update to a docker-py version that has https://github.com/docker/docker-py/pull/2369, https://github.com/docker/docker-py/pull/2380, https://github.com/docker/docker-py/pull/2382 +: ${PY_TEST_OPTIONS:="\ +--deselect=tests/integration/api_swarm_test.py::SwarmTest::test_init_swarm_data_path_addr \ +--deselect=tests/integration/api_exec_test.py::ExecTest::test_detach_with_arg \ +--deselect=tests/integration/api_exec_test.py::ExecDemuxTest::test_exec_command_tty_stream_no_demux \ +--deselect=tests/integration/api_build_test.py::BuildTest::test_build_invalid_platform \ +--deselect=tests/integration/api_image_test.py::PullImageTest::test_build_invalid_platform \ +"} ( bundle .integration-daemon-start