From 25486f7b4db99c6ac03d58a1c4db2e1402f8a2dc Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Sat, 11 Jul 2015 11:57:52 +0100
Subject: [PATCH] cosmetic: s/weave_stop_router/stop_router_on

Also run `weave stop-router` as part of this, so conntrack cleanup
happens.
---
 test/150_connect_forget_test.sh | 2 +-
 test/config.sh                  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/150_connect_forget_test.sh b/test/150_connect_forget_test.sh
index 72130d74..d84fbfe9 100755
--- a/test/150_connect_forget_test.sh
+++ b/test/150_connect_forget_test.sh
@@ -33,7 +33,7 @@ assert_raises "exec_on $HOST1 c1 $PING $C2"
 
 # Forget everyone and disconnect
 assert_raises "weave_on $HOST2 forget $HOST1 $HOST2"
-assert_raises "weave_stop_router $HOST1"
+assert_raises "weave_stop_on $HOST1"
 assert_raises "weave_on $HOST1 launch-router"
 assert_peers $HOST2 ""
 assert_raises "exec_on $HOST1 c1 sh -c '! $PING $C2'"
diff --git a/test/config.sh b/test/config.sh
index 15edb2e3..10cc3fc7 100644
--- a/test/config.sh
+++ b/test/config.sh
@@ -113,13 +113,14 @@ weave_on() {
     DOCKER_HOST=tcp://$host:$DOCKER_PORT $WEAVE "$@"
 }
 
-weave_stop_router() {
+stop_router_on() {
     host=$1
     shift 1
     docker_on $host stop weave 1>/dev/null 2>&1 || true
     if [ -n "$COVERAGE" ] ; then
         collect_coverage $host
     fi
+    weave_on $host stop-router 2>/dev/null
 }
 
 exec_on() {
@@ -206,7 +207,7 @@ start_suite() {
 end_suite() {
     whitely assert_end
     for host in $HOSTS; do
-        weave_stop_router $host
+        stop_router_on $host
     done
 }