From f91a9c25629ce66d7c1e652e9665438df767d7f3 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 12 Jun 2017 10:15:42 +0000 Subject: [PATCH] Fix test: committed image embeds WEAVE_CIDR so we cannot run two of those containers at the same time. Fixed by stopping the first one before we start the second. --- test/610_proxy_wait_for_weave_test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/610_proxy_wait_for_weave_test.sh b/test/610_proxy_wait_for_weave_test.sh index 8a57f941..a701a9bb 100755 --- a/test/610_proxy_wait_for_weave_test.sh +++ b/test/610_proxy_wait_for_weave_test.sh @@ -27,6 +27,7 @@ check_iface_ready 10.2.1.1/24 # Check committed containers only have one weavewait prepended proxy_start_container $HOST1 --name c1 -e 'WEAVE_CIDR=10.2.1.1/24' COMMITTED_IMAGE=$(proxy docker_on $HOST1 commit c1) +docker_on $HOST1 stop -t=1 c1 assert_raises "proxy docker_on $HOST1 run --name c2 $COMMITTED_IMAGE" assert "entrypoint c2" "$(entrypoint $COMMITTED_IMAGE)"