summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2020-01-03 15:47:39 +0100
committerSebastiaan van Stijn <github@gone.nl>2020-01-03 15:47:39 +0100
commitf2b25e498f8ea8bfd30f166717146e11e17e948d (patch)
treeab7ed14f848b99785ad55f8af9e7469ca02b0669
parent6bc45b09e7b06cd68e61c26f0630d09279136d75 (diff)
downloaddocker-f2b25e498f8ea8bfd30f166717146e11e17e948d.tar.gz
docker-py: skip broken ImageCollectionTest::test_pull_multiple
The ImageCollectionTest.test_pull_multiple test performs a `docker pull` without a `:tag` specified) to pull all tags of the given repository (image). After pulling the image, the image(s) pulled are checked to verify if the list of images contains the `:latest` tag. However, the test assumes that all tags of the image are tags for the same version of the image (same digest), and thus a *single* image is returned, which is not always the case. Currently, the `hello-world:latest` and `hello-world:linux` tags point to a different digest, therefore the `client.images.pull()` returns multiple images: one image for digest, making the test fail: =================================== FAILURES =================================== ____________________ ImageCollectionTest.test_pull_multiple ____________________ tests/integration/models_images_test.py:90: in test_pull_multiple assert len(images) == 1 E AssertionError: assert 2 == 1 E + where 2 = len([<Image: 'hello-world:linux'>, <Image: 'hello-world:latest'>]) This patch temporarily skips the broken test until it is fixed upstream. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
-rw-r--r--hack/make/test-docker-py2
1 files changed, 2 insertions, 0 deletions
diff --git a/hack/make/test-docker-py b/hack/make/test-docker-py
index cbc79c479f..f9e4e33468 100644
--- a/hack/make/test-docker-py
+++ b/hack/make/test-docker-py
@@ -10,9 +10,11 @@ source hack/make/.integration-test-helpers
: "${DOCKER_PY_COMMIT:=4.1.0}"
# 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/2485
: "${PY_TEST_OPTIONS:=\
--deselect=tests/integration/api_container_test.py::AttachContainerTest::test_attach_no_stream \
--deselect=tests/integration/api_exec_test.py::ExecDemuxTest::test_exec_command_tty_stream_no_demux \
+--deselect=tests/integration/models_images_test.py::ImageCollectionTest::test_pull_multiple \
--junitxml=${DEST}/junit-report.xml \
}"
(