From b1af1f752d04dbbb0cc484c95133ce7e3a9ac7ca Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 23 May 2015 12:28:43 +0100 Subject: [PATCH] refactor: extract a helper --- test/620_proxy_entrypoint_command_test.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/620_proxy_entrypoint_command_test.sh b/test/620_proxy_entrypoint_command_test.sh index c04f2ba6..73c6401c 100755 --- a/test/620_proxy_entrypoint_command_test.sh +++ b/test/620_proxy_entrypoint_command_test.sh @@ -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