From fa15193011b4daded090707debb5e2d7b3a2569c Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Tue, 22 Nov 2016 17:32:08 +0000
Subject: [PATCH] Wait up to 30s for version check error in logs

---
 test/700_status_and_report_test.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/700_status_and_report_test.sh b/test/700_status_and_report_test.sh
index 19727201..fb1429be 100755
--- a/test/700_status_and_report_test.sh
+++ b/test/700_status_and_report_test.sh
@@ -41,12 +41,17 @@ $SSH $HOST1 tee /tmp/hosts.checkpoint-api > /dev/null <<EOF
 EOF
 CHECKPOINT_DISABLE="" WEAVE_DOCKER_ARGS="-v /tmp/hosts.checkpoint-api:/etc/hosts" 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