Merge pull request #689 from bboreham/671-hide-errors

Silence complaints from http_call when at end of 'weave hide'

Fixes #671.

test/130_expose_test.sh

@@ -29,6 +29,13 @@ check_container_connectivity() {
 
 start_suite "exposing weave network to host"
 
+# expose/hide work prior to launching weave
+run_on1   "! $PING $EXP"
+weave_on1 "expose  $EXP/24"
+run_on1   "  $PING $EXP"
+weave_on1 "hide    $EXP/24"
+run_on1   "! $PING $EXP"
+
 weave_on $HOST1 launch
 
 start_container $HOST1 $C1/24 --name=c1

weave

@@ -947,7 +947,7 @@ case "$COMMAND" in
                 http_call $DNS_CONTAINER_NAME $DNS_HTTP_PORT DELETE /name/weave:expose/${CIDR%/*} 2>/dev/null || true
             fi
         done
-        http_call $CONTAINER_NAME $HTTP_PORT DELETE /ip/weave:expose > /dev/null && true
+        http_call $CONTAINER_NAME $HTTP_PORT DELETE /ip/weave:expose 2>/dev/null || true
         ;;
     stop)
         [ $# -eq 0 ] || usage