Browse code

Merge pull request #40343 from thaJeztah/skip_broken_docker_py_test

docker-py: skip broken ImageCollectionTest::test_pull_multiple, and re-enable fixed tests

Tianon Gravi authored on 2020/01/04 07:56:28
Showing 1 changed files
... ...
@@ -10,14 +10,11 @@ source hack/make/.integration-test-helpers
10 10
 : "${DOCKER_PY_COMMIT:=4.1.0}"
11 11
 
12 12
 # custom options to pass py.test
13
-# 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
13
+# TODO remove these skip once we update to a docker-py version that has https://github.com/docker/docker-py/pull/2485
14 14
 : "${PY_TEST_OPTIONS:=\
15 15
 --deselect=tests/integration/api_container_test.py::AttachContainerTest::test_attach_no_stream \
16 16
 --deselect=tests/integration/api_exec_test.py::ExecDemuxTest::test_exec_command_tty_stream_no_demux \
17
+--deselect=tests/integration/models_images_test.py::ImageCollectionTest::test_pull_multiple \
17 18
 --junitxml=${DEST}/junit-report.xml \
18 19
 }"
19 20
 (