From 980f2813b435166b0fa3509a84f5e435e355f623 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 13 Jul 2019 13:59:18 +0200 Subject: [PATCH] docker-py: skip flaky tests Signed-off-by: Sebastiaan van Stijn --- hack/make/test-docker-py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/make/test-docker-py b/hack/make/test-docker-py index 540fab4970..2dc55a5454 100644 --- a/hack/make/test-docker-py +++ b/hack/make/test-docker-py @@ -8,6 +8,10 @@ source hack/make/.integration-test-helpers # unable to prepare context: unable to 'git clone' to temporary context directory: error fetching: error: no such remote ref ead0bb9e08c13dd3d1712759491eee06bf5a5602 #: exit status 128 : ${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"} ( bundle .integration-daemon-start @@ -45,7 +49,7 @@ source hack/make/.integration-test-helpers echo INFO: Starting docker-py tests... ( [ -n "${TESTDEBUG}" ] && set -x - exec docker run -t --rm ${run_opts} ${docker_py_image} py.test tests/integration + exec docker run -t --rm ${run_opts} ${docker_py_image} pytest ${PY_TEST_OPTIONS} tests/integration ) bundle .integration-daemon-stop ) 2>&1 | tee -a "$DEST/test.log"