Skip to content

Commit

Permalink
Fix test: committed image embeds WEAVE_CIDR
Browse files Browse the repository at this point in the history
so we cannot run two of those containers at the same time.
Fixed by stopping the first one before we start the second.
  • Loading branch information
bboreham committed Jun 12, 2017
1 parent 05314ec commit 24c0dba
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions test/610_proxy_wait_for_weave_test.sh
Expand Up @@ -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)"

Expand Down

0 comments on commit 24c0dba

Please sign in to comment.