From 2b418319f2e22c03bedf7c3fdfb5e82626f3a74e Mon Sep 17 00:00:00 2001 From: Baptiste Donaux Date: Thu, 25 Feb 2016 09:58:17 +0100 Subject: [PATCH] Test to support overlay networks --- test/docker.bats | 8 +++++++- test/lib/docker_helpers.bash | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/test/docker.bats b/test/docker.bats index f4ec665..fcbb756 100644 --- a/test/docker.bats +++ b/test/docker.bats @@ -54,15 +54,21 @@ load test_helpers @test "[$TEST_FILE] separated containers (nginx + docker-gen + nginx.tmpl)" { docker_clean bats-nginx docker_clean bats-docker-gen + docker_network_clean bats-docker-gen-network + + # MAKE network + run docker network create bats-docker-gen-network + assert_success # GIVEN a simple nginx container run docker run -d \ --name bats-nginx \ + --net=bats-docker-gen-network \ -v /etc/nginx/conf.d/ \ -v /etc/nginx/certs/ \ nginx:latest assert_success - run retry 5 1s docker run appropriate/curl --silent --fail --head http://$(docker_ip bats-nginx)/ + run retry 5 1s docker run --net=bats-docker-gen-network appropriate/curl --silent --fail --head http://$(docker_ips bats-nginx)/ assert_output -l 0 $'HTTP/1.1 200 OK\r' # WHEN docker-gen runs on our docker host diff --git a/test/lib/docker_helpers.bash b/test/lib/docker_helpers.bash index 50e1d81..e2749ce 100644 --- a/test/lib/docker_helpers.bash +++ b/test/lib/docker_helpers.bash @@ -8,11 +8,22 @@ function docker_clean { sleep .25s } +# Removes network $1 +function docker_network_clean { + docker network rm $1 &>/dev/null ||: + sleep .25s +} + # get the ip of docker container $1 function docker_ip { docker inspect --format '{{ .NetworkSettings.IPAddress }}' $1 } +# get the ip of docker container $1 +function docker_ips { + docker inspect --format '{{ range .NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' $1 +} + # get the running state of container $1 # → true/false # fails if the container does not exist