improve entrypoint/command selection tests

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

test/650_proxy_entrypoint_override_test.sh

@@ -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