From 2a39b932332501ed37b057784eeb13014a3f18c4 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 10 Mar 2023 14:25:58 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#27226: test: Use self.wait_until over wait_until_helper faa671591f9c83ef0fb5afea151a1907c28f024b test: Use self.wait_until over wait_until_helper (MarcoFalke) Pull request description: `wait_until_helper` is a "private" helper, not intended to be used directly, because it doesn't scale the timeout with the timeout factor. Fix this by replacing it with a call to `self.wait_until`, which does the scaling. ACKs for top commit: theStack: Code-review ACK faa671591f9c83ef0fb5afea151a1907c28f024b Tree-SHA512: 70705f309f83ffd6ea5d090218195d05b868624d909106863372f861138b5a70887070b25beb25044ae1b44250345e45c9cc11191ae7aeca2ad37801a0f62f61 --- test/functional/test_framework/p2p.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/test_framework/p2p.py b/test/functional/test_framework/p2p.py index 2be688ee69..691f575876 100755 --- a/test/functional/test_framework/p2p.py +++ b/test/functional/test_framework/p2p.py @@ -505,7 +505,7 @@ class P2PInterface(P2PConnection): def wait_for_connect(self, timeout=60): test_function = lambda: self.is_connected - wait_until_helper(test_function, timeout=timeout, lock=p2p_lock) + self.wait_until(test_function, timeout=timeout, check_connected=False) def wait_for_disconnect(self, timeout=60): test_function = lambda: not self.is_connected