highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-05-02 01:40:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8680: Address Travis spurious failures

Browse Source 
d6a5dc4 add waitfornewblock/waitforblock/waitforblockheight rpcs and use them for tests (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan
2016-09-09 08:33:26 +02:00
parent 80a4f21d37 d6a5dc4a2e
commit 666eaf03cf
5 changed files with 168 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qa/rpc-tests/test_framework/util.py
View File

@@ -125,12 +125,16 @@ def sync_blocks(rpc_connections, wait=1, timeout=60):
"""
Wait until everybody has the same tip
"""
maxheight = 0
while timeout > 0:
tips = [ x.getbestblockhash() for x in rpc_connections ]
tips = [ x.waitforblockheight(maxheight, int(wait * 1000)) for x in rpc_connections ]
heights = [ x["height"] for x in tips ]
if tips == [ tips[0] ]*len(tips):
return True
time.sleep(wait)
if heights == [ heights[0] ]*len(heights): #heights are the same but hashes are not
raise AssertionError("Block sync failed")
timeout -= wait
maxheight = max(heights)
raise AssertionError("Block sync failed")
def sync_mempools(rpc_connections, wait=1, timeout=60):