GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 9860471708 into merged_master (Bitcoin PR bitcoin/bitcoin#29070)

Browse source
This commit is contained in:
Byron Hambly 2025-11-17 15:58:17 +02:00
commit f35489ef0c
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/functional/test_framework/test_node.py
View file

@ -273,7 +273,7 @@ class TestNode():
if self.version_is_at_least(190000):
# getmempoolinfo.loaded is available since commit
# bb8ae2c (version 0.19.0)
wait_until_helper_internal(lambda: rpc.getmempoolinfo()['loaded'], timeout_factor=self.timeout_factor)
self.wait_until(lambda: rpc.getmempoolinfo()['loaded'])
# Wait for the node to finish reindex, block import, and
# loading the mempool. Usually importing happens fast or
# even "immediate" when the node is started. However, there
@ -427,7 +427,7 @@ class TestNode():
def wait_until_stopped(self, *, timeout=BITCOIND_PROC_WAIT_TIMEOUT, expect_error=False, **kwargs):
expected_ret_code = 1 if expect_error else 0 # Whether node shutdown return EXIT_FAILURE or EXIT_SUCCESS
wait_until_helper_internal(lambda: self.is_node_stopped(expected_ret_code=expected_ret_code, **kwargs), timeout=timeout, timeout_factor=self.timeout_factor)
self.wait_until(lambda: self.is_node_stopped(expected_ret_code=expected_ret_code, **kwargs), timeout=timeout)
def replace_in_config(self, replacements):
"""
@ -547,8 +547,7 @@ class TestNode():
initial_peer_id = get_highest_peer_id()
yield
wait_until_helper_internal(lambda: get_highest_peer_id() > initial_peer_id,
timeout=timeout, timeout_factor=self.timeout_factor)
self.wait_until(lambda: get_highest_peer_id() > initial_peer_id, timeout=timeout)
@contextlib.contextmanager
def profile_with_perf(self, profile_name: str):
@ -760,7 +759,7 @@ class TestNode():
p.peer_disconnect()
del self.p2ps[:]
wait_until_helper_internal(lambda: self.num_test_p2p_connections() == 0, timeout_factor=self.timeout_factor)
self.wait_until(lambda: self.num_test_p2p_connections() == 0)
def bumpmocktime(self, seconds):
"""Fast forward using setmocktime to self.mocktime + seconds. Requires setmocktime to have
@ -769,6 +768,9 @@ class TestNode():
self.mocktime += seconds
self.setmocktime(self.mocktime)
def wait_until(self, test_function, timeout=60):
return wait_until_helper_internal(test_function, timeout=timeout, timeout_factor=self.timeout_factor)
class TestNodeCLIAttr:
def __init__(self, cli, command):