From 8469afeee33e250710959d1438701dca519db366 Mon Sep 17 00:00:00 2001 From: James O'Beirne Date: Wed, 10 Oct 2018 02:51:19 -0400 Subject: [PATCH] test: forward timeouts properly in send_blocks_and_test --- test/functional/test_framework/mininode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index 894f11f893682..1c5c5e3ebd643 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -466,9 +466,9 @@ def send_blocks_and_test(self, blocks, node, success=True, reject_reason=None, e self.send_message(msg_block(blocks[-1])) 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)