Merge pull request #1054 from weaveworks/1042-reset-first-10

Call `weave reset` earlier in smoke-test set-up, to improve reliability

Fixes #1042.

test/config.sh

@@ -170,8 +170,8 @@ assert_dns_ptr_record() {
 start_suite() {
     for host in $HOST1 $HOST2; do
         [ -z "$DEBUG" ] || echo "Cleaning up on $host: removing all containers and resetting weave"
-        rm_containers $host $(docker_on $host ps -aq 2>/dev/null)
         weave_on $host reset 2>/dev/null
+        rm_containers $host $(docker_on $host ps -aq 2>/dev/null)
     done
     whitely echo "$@"
 }