From 1c4beb5ef0e601cb94ea3462554f6aa78f864798 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 23 May 2015 11:58:00 +0100 Subject: [PATCH] improve entrypoint/command selection tests --- test/620_proxy_entrypoint_inheritance_test.sh | 25 ++++++++++++++----- test/650_proxy_entrypoint_override_test.sh | 14 ----------- 2 files changed, 19 insertions(+), 20 deletions(-) delete mode 100755 test/650_proxy_entrypoint_override_test.sh diff --git a/test/620_proxy_entrypoint_inheritance_test.sh b/test/620_proxy_entrypoint_inheritance_test.sh index 0629d7c0..2c70d69d 100755 --- a/test/620_proxy_entrypoint_inheritance_test.sh +++ b/test/620_proxy_entrypoint_inheritance_test.sh @@ -2,13 +2,26 @@ . ./config.sh -start_suite "Proxy uses entrypoint from the image with weavewait" +start_suite "Proxy uses correct entrypoint and command with weavewait" weave_on $HOST1 launch-proxy -docker_on $HOST1 build -t inspect-ethwe - <<- EOF - FROM $SMALL_IMAGE - ENTRYPOINT ["ip", "link", "show", "ethwe"] -EOF -assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' inspect-ethwe | grep 'state UP'" +docker_on $HOST1 build -t check-ethwe-up - <<- EOF + FROM $SMALL_IMAGE + ENTRYPOINT ["grep"] + CMD ["^1$", "/sys/class/net/ethwe/carrier"] +EOF +assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' check-ethwe-up" + +docker_on $HOST1 build -t grep - <<- EOF + FROM $SMALL_IMAGE + ENTRYPOINT ["grep"] +EOF +assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' grep ^1$ /sys/class/net/ethwe/carrier" + +docker_on $HOST1 build -t false - <<- EOF + FROM $SMALL_IMAGE + ENTRYPOINT ["/bin/false"] +EOF +assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' --entrypoint 'grep' false ^1$ /sys/class/net/ethwe/carrier" end_suite diff --git a/test/650_proxy_entrypoint_override_test.sh b/test/650_proxy_entrypoint_override_test.sh deleted file mode 100755 index bd45bdcd..00000000 --- a/test/650_proxy_entrypoint_override_test.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/bash - -. ./config.sh - -start_suite "Proxy allows overridden entrypoint from the container with weavewait" -weave_on $HOST1 launch-proxy -docker_on $HOST1 build -t false - <<- EOF - FROM $SMALL_IMAGE - ENTRYPOINT ["/bin/false"] -EOF - -assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' --entrypoint '/sbin/ip' false link show ethwe | grep 'state UP'" - -end_suite