Factor out test fixture teardown

test/100_cross_hosts_test.sh

@@ -7,12 +7,6 @@ C2=10.2.1.7
 
 start_suite "Ping over cross-host weave network"
 
-for HOST in $HOST1 $HOST2; do
-    weave_on $HOST stop || true
-    weave_on $HOST stop-dns || true
-    docker_on $HOST rm -f c1 c2 || true
-done
-
 weave_on $HOST1 launch
 weave_on $HOST2 launch $HOST1
 

test/110_encryption_test.sh

@@ -7,12 +7,6 @@ C2=10.2.1.7
 
 start_suite "Ping over encrypted cross-host weave network"
 
-for HOST in $HOST1 $HOST2; do
-    weave_on $HOST stop || true
-    weave_on $HOST stop-dns || true
-    docker_on $HOST rm -f c1 c2 || true
-done
-
 weave_on $HOST1 launch -password notverysecure
 weave_on $HOST2 launch -password notverysecure $HOST1
 

test/200_dns_test.sh

@@ -8,12 +8,8 @@ NAME=seetwo.weave.local
 
 start_suite "Resolve names on a single host"
 
-weave_on $HOST1 stop || true
-weave_on $HOST1 stop-dns || true
 weave_on $HOST1 launch-dns 10.2.254.1/24
 
-docker_on $HOST1 rm -f c1 c2 || true
-
 weave_on $HOST1 run $C2/24 -t --name=c2 -h $NAME ubuntu
 weave_on $HOST1 run --with-dns $C1/24 -t --name=c1 aanand/docker-dnsutils /bin/sh
 

test/210_dns_multicast_test.sh

@@ -8,12 +8,6 @@ NAME=seetwo.weave.local
 
 start_suite "Resolve names across hosts"
 
-for host in $HOST1 $HOST2; do
-    weave_on $host stop || true
-    weave_on $host stop-dns || true
-    docker_on $host rm -f c1 c2 || true
-done
-
 weave_on $HOST1 launch
 weave_on $HOST2 launch $HOST1
 

test/220_dns_custom_test.sh

@@ -9,12 +9,8 @@ NAME=seetwo.$DOMAIN
 
 start_suite "Resolve names in custom domain"
 
-weave_on $HOST1 stop || true
-weave_on $HOST1 stop-dns || true
 weave_on $HOST1 launch-dns 10.2.254.1/24 --domain $DOMAIN.
 
-docker_on $HOST1 rm -f c1 c2 || true
-
 weave_on $HOST1 run $C2/24 -t --name=c2 -h $NAME ubuntu
 weave_on $HOST1 run --with-dns $C1/24 -t --name=c1 aanand/docker-dnsutils /bin/sh
 

test/230_dns_unqualified_test.sh

@@ -10,12 +10,8 @@ NAME=seeone.$DOMAIN
 
 start_suite "Resolve unqualified names"
 
-weave_on $HOST1 stop || true
-weave_on $HOST1 stop-dns || true
 weave_on $HOST1 launch-dns 10.2.254.1/24
 
-docker_on $HOST1 rm -f c1 c2 c3 || true
-
 weave_on $HOST1 run $C1/24 -t --name=c1 -h $NAME ubuntu
 weave_on $HOST1 run --with-dns $C2/24 -t --name=c2 -h seetwo.$DOMAIN aanand/docker-dnsutils /bin/sh
 weave_on $HOST1 run --with-dns $C3/24 -t --name=c3 --dns-search=weave.local aanand/docker-dnsutils /bin/sh

test/300_fallback_dns_test.sh

@@ -4,9 +4,7 @@
 
 start_suite "Resolve a non-weave address"
 
-weave_on $HOST1 stop-dns || true
 weave_on $HOST1 launch-dns 10.2.254.1/24 -debug
-docker_on $HOST1 rm -f c1 || true
 
 weave_on $HOST1 run --with-dns 10.2.1.5/24 --name=c1 -t aanand/docker-dnsutils /bin/sh
 

test/400_weave_local_test.sh

@@ -9,11 +9,7 @@ run_on $HOST1 sudo ./weave --local reset
 run_on $HOST1 sudo ./weave --local launch
 assert_raises "docker_on $HOST1 ps | grep weave" 0
 
-docker_on $HOST1 rm -f c1 || true
 run_on $HOST1 sudo ./weave --local run 10.2.6.5/24 -ti --name=c1 ubuntu
-
 assert_raises "exec_on $HOST1 c1 ifconfig | grep ethwe"
 
-docker_on $HOST1 rm -f c1 || true
-
 end_suite

test/500_weave_multi_cidr_test.sh

@@ -4,11 +4,6 @@
 
 start_suite "Weave run/start/attach/detach with multiple cidr arguments"
 
-# Cleanup from previous run
-weave_on $HOST1 stop || true
-weave_on $HOST1 stop-dns || true
-docker_on $HOST1 rm -f multicidr || true
-
 weave_on $HOST1 launch
 weave_on $HOST1 launch-dns 10.254.254.254/24
 

test/config.sh

@@ -95,6 +95,12 @@ assert_dns_record() {
 }
 
 start_suite() {
+    for HOST in $HOST1 $HOST2; do
+        echo "Cleaning up on $HOST: removing all containers and resetting weave"
+        CONTAINERS=$(docker -H tcp://$HOST:2375 ps -aq)
+        [ -n "$CONTAINERS" ] && docker -H tcp://$HOST:2375 rm -f $CONTAINERS > /dev/null
+        weave_on $HOST reset > /dev/null
+    done
     whitely echo $@
 }