mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 02:25:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge #8854: [qa] Fix race condition in p2p-compactblocks test

Browse Source 
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
This commit is contained in:
MarcoFalke 2016-10-01 11:19:16 +02:00
commit 6faffb8a83
No known key found for this signature in database
GPG Key ID: 2D7F2372E50FE137
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/rpc-tests/p2p-compactblocks.py
View File

@ -237,6 +237,8 @@ class CompactBlocksTest(BitcoinTestFramework):
for i in range(num_transactions): for i in range(num_transactions):
self.nodes[0].sendtoaddress(address, 0.1) self.nodes[0].sendtoaddress(address, 0.1)
self.test_node.sync_with_ping()
# Now mine a block, and look at the resulting compact block. # Now mine a block, and look at the resulting compact block.
self.test_node.clear_block_announcement() self.test_node.clear_block_announcement()
block_hash = int(self.nodes[0].generate(1)[0], 16) block_hash = int(self.nodes[0].generate(1)[0], 16)

2
qa/rpc-tests/test_framework/mininode.py
View File

@ -1536,7 +1536,7 @@ class SingleNodeConnCB(NodeConnCB):
def received_pong(): def received_pong():
return (self.last_pong.nonce == self.ping_counter) return (self.last_pong.nonce == self.ping_counter)
self.send_message(msg_ping(nonce=self.ping_counter)) self.send_message(msg_ping(nonce=self.ping_counter))
success = wait_until(received_pong, timeout) success = wait_until(received_pong, timeout=timeout)
self.ping_counter += 1 self.ping_counter += 1
return success return success