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 committed Oct 10, 2018
1 parent be99270 commit 94e21c1
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 @@ -500,9 +500,9 @@ def send_blocks_and_test(self, blocks, node, *, success=True, request_block=True
wait_until(lambda: blocks[-1].sha256 in self.getdata_requests, timeout=timeout, lock=mininode_lock)

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 94e21c1

Please sign in to comment.