From fa1cd9e1ddc6918c3d600d36eadea71eebb242b6 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 27 Aug 2020 11:52:52 +0200 Subject: test: Remove unused lock arg from BitcoinTestFramework.wait_until --- test/functional/p2p_leak.py | 8 ++++---- test/functional/test_framework/test_framework.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/functional/p2p_leak.py b/test/functional/p2p_leak.py index 4978aa3845..4b32d60db0 100755 --- a/test/functional/p2p_leak.py +++ b/test/functional/p2p_leak.py @@ -17,7 +17,7 @@ from test_framework.messages import ( msg_ping, msg_version, ) -from test_framework.p2p import p2p_lock, P2PInterface +from test_framework.p2p import P2PInterface from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, @@ -113,9 +113,9 @@ class P2PLeakTest(BitcoinTestFramework): # verack, since we never sent one no_verack_idle_peer.wait_for_verack() - self.wait_until(lambda: no_version_disconnect_peer.ever_connected, timeout=10, lock=p2p_lock) - self.wait_until(lambda: no_version_idle_peer.ever_connected, timeout=10, lock=p2p_lock) - self.wait_until(lambda: no_verack_idle_peer.version_received, timeout=10, lock=p2p_lock) + no_version_disconnect_peer.wait_until(lambda: no_version_disconnect_peer.ever_connected, check_connected=False) + no_version_idle_peer.wait_until(lambda: no_version_idle_peer.ever_connected) + no_verack_idle_peer.wait_until(lambda: no_verack_idle_peer.version_received) # Mine a block and make sure that it's not sent to the connected peers self.nodes[0].generate(nblocks=1) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index a0f5528afb..f41f5129b8 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -603,8 +603,8 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): self.sync_blocks(nodes) self.sync_mempools(nodes) - def wait_until(self, test_function, timeout=60, lock=None): - return wait_until_helper(test_function, timeout=timeout, lock=lock, timeout_factor=self.options.timeout_factor) + def wait_until(self, test_function, timeout=60): + return wait_until_helper(test_function, timeout=timeout, timeout_factor=self.options.timeout_factor) # Private helper methods. These should not be accessed by the subclass test scripts. -- cgit v1.2.3