LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #9136: sync_blocks cleanup

Browse source 
7943b13 [qa] Avoid 2 list comprehensions in sync_blocks (Russell Yanofsky)
05e57cc [qa] Fix sync_blocks timeout argument (Russell Yanofsky)
fd6bb70 [qa] Improve sync_blocks error messages. (Russell Yanofsky)
This commit is contained in:
MarcoFalke 2016-11-14 20:27:28 +01:00
commit b422913346
No known key found for this signature in database
GPG key ID: 2D7F2372E50FE137
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
qa/rpc-tests/test_framework/util.py
View file

@ -123,19 +123,26 @@ def str_to_b64str(string):
def sync_blocks(rpc_connections, *, wait=1, timeout=60): def sync_blocks(rpc_connections, *, wait=1, timeout=60):
""" """
Wait until everybody has the same tip Wait until everybody has the same tip.
sync_blocks needs to be called with an rpc_connections set that has least
one node already synced to the latest, stable tip, otherwise there's a
chance it might return before all nodes are stably synced.
""" """
maxheight = 0 maxheight = 0
while timeout > 0: start_time = cur_time = time.time()
while cur_time <= start_time + timeout:
tips = [r.waitforblockheight(maxheight, int(wait * 1000)) for r in rpc_connections] tips = [r.waitforblockheight(maxheight, int(wait * 1000)) for r in rpc_connections]
heights = [t["height"] for t in tips] heights = [t["height"] for t in tips]
if tips == [tips[0]] * len(tips): if all(t == tips[0] for t in tips):
return return
if heights == [heights[0]] * len(heights): if all(h == heights[0] for h in heights):
raise AssertionError("Block sync failed: (Hashes don't match)") raise AssertionError("Block sync failed, mismatched block hashes:{}".format(
timeout -= wait "".join("\n {!r}".format(tip) for tip in tips)))
maxheight = max(heights) maxheight = max(heights)
raise AssertionError("Block sync failed with heights: {}".format(heights)) cur_time = time.time()
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): def sync_chain(rpc_connections, *, wait=1, timeout=60):
""" """