reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.0'

Browse Source
This commit is contained in:
Matthias Radestock committed 2015-08-13 14:07:22 +01:00
2 parents 686500b181 a3b4d6cdbf
commit 26f4a41900
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
test/610_proxy_wait_for_weave_test.sh
+2 -2
View File
@@ -27,8 +27,8 @@ assert_raises "proxy docker_on $HOST1 exec c3 true"
assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.2/24' $BASE_IMAGE touch /w/w" 1
# Check only user-specified volumes and /w are mounted
dirs_sans_proxy=$(docker_on $HOST1 run --rm -it $BASE_IMAGE mount | wc -l)
dirs_with_proxy=$(proxy docker_on $HOST1 run --rm -it -v /tmp/1:/srv1 -v /tmp/2:/srv2 -e 'WEAVE_CIDR=10.2.1.3/24' $BASE_IMAGE mount | wc -l)
dirs_sans_proxy=$(docker_on $HOST1 run --rm -it $SMALL_IMAGE mount | wc -l)
dirs_with_proxy=$(proxy docker_on $HOST1 run --rm -it -v /tmp/1:/srv1 -v /tmp/2:/srv2 -e 'WEAVE_CIDR=10.2.1.3/24' $SMALL_IMAGE mount | wc -l)
assert "echo $((dirs_with_proxy-3))" $dirs_sans_proxy
# Check errors are returned (when docker returns an error code)