test: forward timeouts properly in send_blocks_and_test
This commit is contained in:
parent
be992701b0
commit
94e21c1501
1 changed files with 2 additions and 2 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue