cosmetic: s/weave_stop_router/stop_router_on

Also run `weave stop-router` as part of this, so conntrack cleanup
happens.
This commit is contained in:
Matthias Radestock committed 2015-07-11 11:58:29 +01:00
1 parent c22d824db8
commit 25486f7b4d
2 files changed
+4 -3

No files matched your search

+3 -2
View File
@@ -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
}