From 7cf8234d9f70135053e1dec15d8cf9ec448c3069 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Mon, 18 May 2015 14:54:46 +0100
Subject: [PATCH 1/2] Silence complaints from http_call when at end of 'weave
 hide'

---
 weave | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weave b/weave
index d46c8486..ca73a84d 100755
--- a/weave
+++ b/weave
@@ -946,7 +946,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

From 286c46653ce0b72e097f1d54ae63feee5299b175 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Mon, 18 May 2015 15:02:39 +0100
Subject: [PATCH 2/2] Add smoke tests for 'weave expose' and 'weave hide' when
 weave isn't running

---
 test/130_expose_test.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/130_expose_test.sh b/test/130_expose_test.sh
index cacc3dfd..d0a26e2a 100755
--- a/test/130_expose_test.sh
+++ b/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