From a81a873703fa74354c3530ac95762751b14548b9 Mon Sep 17 00:00:00 2001 From: Marc CARRE Date: Wed, 1 Mar 2017 15:11:58 +0000 Subject: [PATCH] Upgrade docker-py to 1.9.0-rc2 to fix test #602. Since 1.12.0, `docker inspect -f "{{ .NetworkSettings.Networks..Aliases }}"` also returns the container's short ID. See also: https://github.com/docker/docker/blob/master/CHANGELOG.md > 1.12.0 (2016-07-28) > Networking > Add container's short-id as default network alias #21901 Upgrading `docker/docker-py` to 1.9.0-rc2 effectively relaxes test assertions for: - `tests/integration/network_test.py#test_connect_with_aliases` - `tests/integration/network_test.py#test_create_with_aliases` which do something equivalent to: ``` $ docker network create net1 $ docker run --name c1 -d busybox top $ docker network connect --alias foo --alias bar net1 c1 $ docker inspect -f "{{ .NetworkSettings.Networks.net1.Aliases }}" c1 [foo bar e52bf50e5ee7] ``` allowing us to be consistent with the above change. In 1.8.1, the below fails as the container's short ID would be present: ``` self.assertEqual( container_data['NetworkSettings']['Networks'][net_name]['Aliases'], ['foo', 'bar']) ``` In 1.9.0-rc2, the below passes as the container's short ID is ignored: ``` aliases = ( container_data['NetworkSettings']['Networks'][net_name]['Aliases'] ) assert 'foo' in aliases assert 'bar' in aliases ``` --- test/600_proxy_docker_py.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/600_proxy_docker_py.sh b/test/600_proxy_docker_py.sh index f0a55222..8e54f2c1 100755 --- a/test/600_proxy_docker_py.sh +++ b/test/600_proxy_docker_py.sh @@ -3,7 +3,7 @@ . "$(dirname "$0")/config.sh" -IMAGE="joffrey/docker-py:1.8.1" +IMAGE="joffrey/docker-py:1.9.0-rc2" docker_py_test() { SHARD=$1