remove remnants of the weaveproxy and weaveplugin containers

test/090_docker_restart_policy_2_test.sh

@@ -12,7 +12,7 @@ assert_raises "check_restart $HOST1 weave"
 # in the old containers being removed and new ones created
 weave_on $HOST1 stop
 weave_on $HOST1 launch --no-restart
-assert "docker_on $HOST1 inspect -f '{{.HostConfig.RestartPolicy.Name}}' weave weaveproxy" "no"
+assert "docker_on $HOST1 inspect -f '{{.HostConfig.RestartPolicy.Name}}' weave" "no"
 assert_raises "! check_restart $HOST1 weave"
 
 # Relaunch to prevent the `weave stop` in `end_suite`

test/config.sh

@@ -136,9 +136,7 @@ stop_weave_on() {
     host=$1
     weave_on $host stop 1>/dev/null 2>&1 || true
     if [ -n "$COVERAGE" ]; then
-        for C in weaveplugin weave ; do
-            collect_coverage $host $C
-        done
+        collect_coverage $host weave
     fi
 }
 
@@ -322,8 +320,7 @@ check_restart() {
 start_suite() {
     for host in $HOSTS; do
         [ -z "$DEBUG" ] || echo "Cleaning up on $host: removing all containers and resetting weave"
-        PLUGIN_FILTER=$(docker_on $host inspect -f 'grep -v {{printf "%.12s" .Id}}' weaveplugin 2>/dev/null) || PLUGIN_FILTER=cat
-        rm_containers $host $(docker_on $host ps -aq 2>/dev/null | $PLUGIN_FILTER)
+        rm_containers $host $(docker_on $host ps -aq 2>/dev/null)
         weave_on $host reset 2>/dev/null
         run_on $host sudo rm -f /opt/cni/bin/weave-plugin-latest /opt/cni/bin/weave-net /opt/cni/bin/weave-ipam /etc/cni/net.d/10-weave.conf
     done