From fd6bb700b77491689f0b5f34bdfb75764138f406 Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Fri, 11 Nov 2016 15:38:59 -0500
Subject: [PATCH] [qa] Improve sync_blocks error messages.

---
 qa/rpc-tests/test_framework/util.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index b5ef0689b..2de4d5e30 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -132,10 +132,12 @@ def sync_blocks(rpc_connections, *, wait=1, timeout=60):
         if tips == [tips[0]] * len(tips):
             return
         if heights == [heights[0]] * len(heights):
-            raise AssertionError("Block sync failed: (Hashes don't match)")
+            raise AssertionError("Block sync failed, mismatched block hashes:{}".format(
+                                 "".join("\n  {!r}".format(tip) for tip in tips)))
         timeout -= wait
         maxheight = max(heights)
-    raise AssertionError("Block sync failed with heights: {}".format(heights))
+    raise AssertionError("Block sync to height {} timed out:{}".format(
+                         maxheight, "".join("\n  {!r}".format(tip) for tip in tips)))
 
 def sync_chain(rpc_connections, *, wait=1, timeout=60):
     """