highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-10-11 03:53:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: Rename wait until helper to wait_until_helper

Browse Source
This commit is contained in:
MarcoFalke
2020-08-27 08:55:20 +02:00
parent facb41bf1d
commit fad2794e93
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/functional/test_framework/p2p.py
View File

@@ -69,7 +69,7 @@ from test_framework.messages import (
NODE_WITNESS,
sha256,
)
from test_framework.util import wait_until
from test_framework.util import wait_until_helper
logger = logging.getLogger("TestFramework.p2p")
@@ -293,7 +293,7 @@ class P2PInterface(P2PConnection):
# Track the most recent message of each type.
# To wait for a message to be received, pop that message from
# this and use wait_until.
# this and use self.wait_until.
self.last_message = {}
# A count of the number of ping messages we've sent to the node
@@ -398,7 +398,7 @@ class P2PInterface(P2PConnection):
assert self.is_connected
return test_function_in()
wait_until(test_function, timeout=timeout, lock=p2p_lock, timeout_factor=self.timeout_factor)
wait_until_helper(test_function, timeout=timeout, lock=p2p_lock, timeout_factor=self.timeout_factor)
def wait_for_disconnect(self, timeout=60):
test_function = lambda: not self.is_connected
@@ -522,7 +522,7 @@ class NetworkThread(threading.Thread):
def close(self, timeout=10):
"""Close the connections and network event loop."""
self.network_event_loop.call_soon_threadsafe(self.network_event_loop.stop)
wait_until(lambda: not self.network_event_loop.is_running(), timeout=timeout)
wait_until_helper(lambda: not self.network_event_loop.is_running(), timeout=timeout)
self.network_event_loop.close()
self.join(timeout)
# Safe to remove event loop.