Skip to content

Commit

Permalink
test: forward timeouts properly in send_blocks_and_test
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesob authored and furszy committed Jun 28, 2021
1 parent db28a53 commit 8469afe
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/functional/test_framework/mininode.py
Original file line number Diff line number Diff line change
Expand Up @@ -466,9 +466,9 @@ def send_blocks_and_test(self, blocks, node, success=True, reject_reason=None, e
self.send_message(msg_block(blocks[-1]))

if expect_disconnect:
self.wait_for_disconnect()
self.wait_for_disconnect(timeout=timeout)
else:
self.sync_with_ping()
self.sync_with_ping(timeout=timeout)

if success:
wait_until(lambda: node.getbestblockhash() == blocks[-1].hash, timeout=timeout)
Expand Down

0 comments on commit 8469afe

Please sign in to comment.