mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
48353e16fe
The docker-py tests were broken, because the version of py-test that was used, used a dependency that had a new major release with a breaking change. Unfortunately, it was not pinned to a specific version, so when the dependency did the release, py-test broke; ``` 22:16:47 Traceback (most recent call last): 22:16:47 File "/usr/local/bin/pytest", line 10, in <module> 22:16:47 sys.exit(main()) 22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 61, in main 22:16:47 config = _prepareconfig(args, plugins) 22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 182, in _prepareconfig 22:16:47 config = get_config() 22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 156, in get_config 22:16:47 pluginmanager.import_plugin(spec) 22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 530, in import_plugin 22:16:47 __import__(importspec) 22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 25, in <module> 22:16:47 class TempPathFactory(object): 22:16:47 File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 35, in TempPathFactory 22:16:47 lambda p: Path(os.path.abspath(six.text_type(p))) 22:16:47 TypeError: attrib() got an unexpected keyword argument 'convert' ``` docker-py master has a fix for this (bumping the version of `py-test`), but it's not in a release yet, and the docker cli that's used in our CI is pinned to 17.06, which doesn't support building from a remote git repository from a specific git commit. To fix the immediate situation, this patch switches the docker-py tests to run from the master branch. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
65 lines
2.8 KiB
Bash
65 lines
2.8 KiB
Bash
#!/usr/bin/env bash
|
|
set -e
|
|
|
|
source hack/make/.integration-test-helpers
|
|
|
|
# The commit or tag to use for testing
|
|
# TODO docker 17.06 cli client used in CI fails to build using a sha;
|
|
# unable to prepare context: unable to 'git clone' to temporary context directory: error fetching: error: no such remote ref ead0bb9e08c13dd3d1712759491eee06bf5a5602
|
|
#: exit status 128
|
|
: "${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
|
|
: "${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 \
|
|
--junitxml=${DEST}/junit-report.xml \
|
|
}"
|
|
(
|
|
bundle .integration-daemon-start
|
|
|
|
docker_host_scheme=$(echo "${DOCKER_HOST}" | cut -d: -f1 -)
|
|
|
|
case "${docker_host_scheme}" in
|
|
unix)
|
|
# trim the tcp:// scheme, and bind-mount the docker socket into the container
|
|
run_opts="--mount type=bind,src=${DOCKER_HOST#unix://},dst=/var/run/docker.sock"
|
|
;;
|
|
|
|
tcp)
|
|
# run container in host-mode networking so that it can connect to the
|
|
# daemon from the current networking namespace (e.g., to connect to localhost)
|
|
run_opts="--network=host -e DOCKER_HOST=${DOCKER_HOST}"
|
|
;;
|
|
|
|
*)
|
|
echo "WARN: Skipping test-docker-py: connecting to docker daemon using ${docker_host_scheme} (${DOCKER_HOST}) not supported"
|
|
bundle .integration-daemon-stop
|
|
return 0
|
|
esac
|
|
|
|
docker_py_image="docker-sdk-python3:${DOCKER_PY_COMMIT}"
|
|
if ! docker image inspect "dockerPyImage" &> /dev/null; then
|
|
echo INFO: Building ${docker_py_image}...
|
|
(
|
|
[ -n "${TESTDEBUG}" ] && set -x
|
|
[ -z "${TESTDEBUG}" ] && build_opts="--quiet"
|
|
[ -f /.dockerenv ] || build_opts="${build_opts} --network=host"
|
|
# shellcheck disable=SC2086
|
|
exec docker build ${build_opts} -t "${docker_py_image}" -f tests/Dockerfile "https://github.com/docker/docker-py.git#${DOCKER_PY_COMMIT}"
|
|
)
|
|
fi
|
|
|
|
echo INFO: Starting docker-py tests...
|
|
(
|
|
[ -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
|
|
)
|
|
bundle .integration-daemon-stop
|
|
) 2>&1 | tee -a "$DEST/test.log"
|