diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2020-02-11 11:07:42 +0100 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2020-02-11 15:50:49 +0100 |
| commit | 5a028d273670106034fffe742b7758e310337b5b (patch) | |
| tree | 0257cca18357b984f31efe2fb6cb63c28db37fde | |
| parent | 10425ed4cb855bc6d0e51b83084d2eaa1bab9ad5 (diff) | |
| download | docker-5a028d273670106034fffe742b7758e310337b5b.tar.gz | |
docker-py: override default API version to run all tests
Otherwise some tests are skipped with the default API version
used:
SKIPPED [1] tests/integration/api_service_test.py:882: API version is too low (< 1.38)
SKIPPED [1] tests/integration/api_swarm_test.py:59: API version is too low (< 1.39)
SKIPPED [1] tests/integration/api_swarm_test.py:38: API version is too low (< 1.39)
SKIPPED [1] tests/integration/api_swarm_test.py:45: API version is too low (< 1.39)
SKIPPED [1] tests/integration/api_swarm_test.py:52: API version is too low (< 1.39)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| -rw-r--r-- | hack/make/test-docker-py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hack/make/test-docker-py b/hack/make/test-docker-py index ebb813da17..8af21f3763 100644 --- a/hack/make/test-docker-py +++ b/hack/make/test-docker-py @@ -9,6 +9,10 @@ source hack/make/.integration-test-helpers #: exit status 128 : "${DOCKER_PY_COMMIT:=4.2.0}" +# Override the API version used to make sure all tests are run +# TODO remove this or unset this after https://github.com/docker/docker-py/pull/2512 is merged +: "${DOCKER_PY_TEST_API_VERSION:=1.39}" + # custom options to pass py.test # # This option can be used to temporarily skip flaky tests (using the `--deselect` @@ -54,7 +58,7 @@ source hack/make/.integration-test-helpers ( [ -n "${TESTDEBUG}" ] && set -x # shellcheck disable=SC2086,SC2140 - exec docker run --rm ${run_opts} --mount type=bind,"src=${ABS_DEST}","dst=/src/${DEST}" "${docker_py_image}" pytest ${PY_TEST_OPTIONS} tests/integration + exec docker run --rm ${run_opts} -e DOCKER_TEST_API_VERSION="${DOCKER_PY_TEST_API_VERSION}" --mount type=bind,"src=${ABS_DEST}","dst=/src/${DEST}" "${docker_py_image}" pytest ${PY_TEST_OPTIONS} tests/integration ) bundle .integration-daemon-stop ) 2>&1 | tee -a "$DEST/test.log" |