Skip to content

Commit

Permalink
Don't use .Volumes in tests, as it's gone in docker 1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
paulbellamy committed Aug 12, 2015
1 parent 17bc550 commit 76d3455
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/610_proxy_wait_for_weave_test.sh
Expand Up @@ -31,7 +31,7 @@ assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.2/24' $BASE_IMAG
# Check only user-specified volumes and /w are mounted
proxy docker_on $HOST1 create --name c4 -v /tmp/1:/srv1 -v /tmp/2:/srv2 -e 'WEAVE_CIDR=10.2.1.3/24' $BASE_IMAGE $CHECK_ETHWE_UP
proxy docker_on $HOST1 start -ai c4
assert "docker_on $HOST1 inspect --format='{{range \$k, \$v := .Volumes}}{{\$k}} {{end}}' c4" "/srv1 /srv2 /w "
assert "docker_on $HOST1 inspect --format='{{range .Mounts}}{{.Destination}} {{end}}' c4" "/srv1 /srv2 /w "

# Check errors are returned (when docker returns an error code)
assert_raises "docker -H tcp://$HOST1:12375 run -e 'WEAVE_CIDR=10.2.1.3/24' $SMALL_IMAGE foo 2>&1 | grep 'exec: \"foo\": executable file not found in \$PATH'"
Expand Down

0 comments on commit 76d3455

Please sign in to comment.