refactor: extract a helper

This commit is contained in:
Matthias Radestock committed 2015-05-23 12:28:43 +01:00
1 parent 01bc994822
commit b1af1f752d
1 file changed
+7 -3
+7 -3
View File
@@ -10,16 +10,20 @@ build_image() {
EOF
}
run_container() {
assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' $1"
}
start_suite "Proxy uses correct entrypoint and command with weavewait"
weave_on $HOST1 launch-proxy
build_image check-ethwe-up '["grep"]' '["^1$", "/sys/class/net/ethwe/carrier"]'
assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' check-ethwe-up"
run_container "check-ethwe-up"
build_image grep '["grep"]' ''
assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' grep ^1$ /sys/class/net/ethwe/carrier"
run_container "grep ^1$ /sys/class/net/ethwe/carrier"
build_image false '["/bin/false"]' ''
assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' --entrypoint 'grep' false ^1$ /sys/class/net/ethwe/carrier"
run_container "--entrypoint='grep' false ^1$ /sys/class/net/ethwe/carrier"
end_suite