Merge branch '1.8'

test/700_status_and_report_test.sh

@@ -40,12 +40,17 @@ $SSH $HOST1 sudo rm -f /tmp/resolv.conf.broken
 $SSH $HOST1 sh -c "echo 'nameserver 127.1.1.1' > /tmp/resolv.conf.broken"
 CHECKPOINT_DISABLE="" WEAVE_DOCKER_ARGS="-v /tmp/resolv.conf.broken:/etc/resolv.conf" weave_on $HOST1 launch
 
+wait_for_version_check_error() {
+    while true; do
+        docker_on $HOST1 logs weave 2>&1 | grep 'Error checking version' && return
+        sleep 1
+    done
+}
+assert_raises "timeout 30 cat <( wait_for_version_check_error )"
+
 assert "weave_on $HOST1 report -f '{{.VersionCheck.Enabled}}'" "true"
 assert "weave_on $HOST1 report -f '{{.VersionCheck.Success}}'" "false"
 assert "weave_on $HOST1 report -f '{{.VersionCheck.NewVersion}}'" ""
-assert_raises "weave_on $HOST1 status | grep 'failed to check latest version - see logs; next check at'"
-
-
 
 weave_on $HOST1 reset