diff options
| author | James O'Beirne <james.obeirne@gmail.com> | 2018-10-10 02:51:19 -0400 |
|---|---|---|
| committer | James O'Beirne <james.obeirne@gmail.com> | 2018-10-10 02:51:19 -0400 |
| commit | 94e21c1501660e16d6d6bff94265bf910102b8a1 (patch) | |
| tree | 15571b2b5799a5339fdca325214afab801a52921 /test/functional/test_framework/mininode.py | |
| parent | be992701b018f256db6d64786624be4cb60d8975 (diff) | |
| download | bitcoin-94e21c1501660e16d6d6bff94265bf910102b8a1.tar.xz | |
test: forward timeouts properly in send_blocks_and_test
Diffstat (limited to 'test/functional/test_framework/mininode.py')
| -rwxr-xr-x | test/functional/test_framework/mininode.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index f8caa57250..6864e8a838 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -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) |