beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #437 from thaJeztah/19.03_backport_skip_broken_docker_py_test

Browse source 
[19.03 backport] docker-py: skip broken ImageCollectionTest::test_pull_multiple, and re-enable fixed tests
This commit is contained in:
Sebastiaan van Stijn 2020-01-16 20:56:16 +01:00 committed by GitHub
commit 077f093988
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hack/make/test-docker-py
View file

@ -10,14 +10,11 @@ source hack/make/.integration-test-helpers
: "${DOCKER_PY_COMMIT:=master}"
# 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, https://github.com/docker/docker-py/pull/2380, https://github.com/docker/docker-py/pull/2382
# TODO remove these skip once we update to a docker-py version that has https://github.com/docker/docker-py/pull/2485
: "${PY_TEST_OPTIONS:=\
--deselect=tests/integration/api_swarm_test.py::SwarmTest::test_init_swarm_data_path_addr \
--deselect=tests/integration/api_container_test.py::AttachContainerTest::test_attach_no_stream \
--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_pull_invalid_platform \
--deselect=tests/integration/models_images_test.py::ImageCollectionTest::test_pull_multiple \
--junitxml=${DEST}/junit-report.xml \
}"
(