aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_framework
diff options
context:
space:
mode:
authorJames O'Beirne <james.obeirne@gmail.com>2018-10-10 02:51:19 -0400
committerJames O'Beirne <james.obeirne@gmail.com>2018-10-10 02:51:19 -0400
commit94e21c1501660e16d6d6bff94265bf910102b8a1 (patch)
tree15571b2b5799a5339fdca325214afab801a52921 /test/functional/test_framework
parentbe992701b018f256db6d64786624be4cb60d8975 (diff)
test: forward timeouts properly in send_blocks_and_test
Diffstat (limited to 'test/functional/test_framework')
-rwxr-xr-xtest/functional/test_framework/mininode.py4
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)