highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-05 05:02:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: forward timeouts properly in send_blocks_and_test

Browse Source
This commit is contained in:
James O'Beirne
2018-10-10 02:51:19 -04:00
parent be992701b0
commit 94e21c1501
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/test_framework/mininode.py
View File

@ -500,9 +500,9 @@ class P2PDataStore(P2PInterface):
wait_until(lambda: blocks[-1].sha256 in self.getdata_requests, timeout=timeout, lock=mininode_lock) wait_until(lambda: blocks[-1].sha256 in self.getdata_requests, timeout=timeout, lock=mininode_lock)
if expect_disconnect: if expect_disconnect:
self.wait_for_disconnect() self.wait_for_disconnect(timeout=timeout)
else: else:
self.sync_with_ping() self.sync_with_ping(timeout=timeout)
if success: if success:
wait_until(lambda: node.getbestblockhash() == blocks[-1].hash, timeout=timeout) wait_until(lambda: node.getbestblockhash() == blocks[-1].hash, timeout=timeout)