test: forward timeouts properly in send_blocks_and_test

This commit is contained in:
James O'Beirne 2018-10-10 02:51:19 -04:00
parent be992701b0
commit 94e21c1501

View file

@ -500,9 +500,9 @@ class P2PDataStore(P2PInterface):
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)