Marc CARRE
a81a873703
Since 1.12.0, `docker inspect -f "{{ .NetworkSettings.Networks.<network>.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
```
49 lines
1.2 KiB
Bash
Executable File
49 lines
1.2 KiB
Bash
Executable File
#! /bin/bash
|
|
# Explicitly not called _test.sh - this isn't run, but imported by other tests.
|
|
|
|
. "$(dirname "$0")/config.sh"
|
|
|
|
IMAGE="joffrey/docker-py:1.9.0-rc2"
|
|
|
|
docker_py_test() {
|
|
SHARD=$1
|
|
TOTAL_SHARDS=$2
|
|
|
|
start_suite "Run docker-py test suite against the proxy"
|
|
|
|
# Work round https://github.com/docker/docker-py/issues/852
|
|
docker_on $HOST1 pull busybox:buildroot-2014.02 >/dev/null
|
|
# Get a list of the tests for use to shard
|
|
docker_on $HOST1 pull $IMAGE >/dev/null
|
|
CANDIDATES=$(docker_on $HOST1 run \
|
|
$IMAGE \
|
|
py.test --collect-only tests/integration/ \
|
|
| sed -En "s/\s*<Module '([[:print:]]+)'>/\1/p")
|
|
|
|
i=0
|
|
TESTS=
|
|
for test in $CANDIDATES; do
|
|
if [ $(($i % $TOTAL_SHARDS)) -eq $SHARD ]; then
|
|
TESTS="$TESTS $test"
|
|
fi
|
|
i=$(($i + 1))
|
|
done
|
|
|
|
weave_on $HOST1 launch-proxy --no-default-ipalloc
|
|
|
|
DOCKER_BRIDGE_IP=$(weave_on $HOST1 docker-bridge-ip)
|
|
|
|
if docker_on $HOST1 run \
|
|
-e NOT_ON_HOST=true \
|
|
-e DOCKER_HOST=tcp://$DOCKER_BRIDGE_IP:12375 \
|
|
-v /tmp:/tmp \
|
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
|
$IMAGE py.test $TESTS ; then
|
|
assert_raises "true"
|
|
else
|
|
assert_raises "false"
|
|
fi
|
|
|
|
end_suite
|
|
}
|