1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

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>
This commit is contained in:
Sebastiaan van Stijn 2020-02-11 11:07:42 +01:00
parent 10425ed4cb
commit 5a028d2736
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C

View file

@ -9,6 +9,10 @@ source hack/make/.integration-test-helpers
#: exit status 128 #: exit status 128
: "${DOCKER_PY_COMMIT:=4.2.0}" : "${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 # custom options to pass py.test
# #
# This option can be used to temporarily skip flaky tests (using the `--deselect` # 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 [ -n "${TESTDEBUG}" ] && set -x
# shellcheck disable=SC2086,SC2140 # 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 bundle .integration-daemon-stop
) 2>&1 | tee -a "$DEST/test.log" ) 2>&1 | tee -a "$DEST/test.log"