Permalink
Browse files

[qa] Fix race condition in p2p-compactblocks test

Also fix a bug in the sync_with_ping() helper function
  • Loading branch information...
sdaftuar committed Oct 1, 2016
1 parent 08cc5fd commit b5fd666984fdb7125cb809c773b36034f32128cc
Showing with 3 additions and 1 deletion.
  1. +2 −0 qa/rpc-tests/p2p-compactblocks.py
  2. +1 −1 qa/rpc-tests/test_framework/mininode.py
@@ -237,6 +237,8 @@ def test_compactblock_construction(self):
for i in range(num_transactions):
self.nodes[0].sendtoaddress(address, 0.1)
self.test_node.sync_with_ping()
# Now mine a block, and look at the resulting compact block.
self.test_node.clear_block_announcement()
block_hash = int(self.nodes[0].generate(1)[0], 16)
@@ -1536,7 +1536,7 @@ def sync_with_ping(self, timeout=30):
def received_pong():
return (self.last_pong.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
return success

0 comments on commit b5fd666

Please sign in to comment.