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

test: clean up is node stopped

Browse Source
This commit is contained in:
dimitaracev 2023-06-15 12:31:35 +02:00
parent 681ecac5c2
commit 6779e6ed7f
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/functional/test_framework/test_node.py
View File

@ -365,7 +365,7 @@ class TestNode():
if wait_until_stopped: if wait_until_stopped:
self.wait_until_stopped() self.wait_until_stopped()
def is_node_stopped(self, expected_ret_code=None): def is_node_stopped(self, expected_ret_code=0):
"""Checks whether the node has stopped. """Checks whether the node has stopped.
Returns True if the node has stopped. False otherwise. Returns True if the node has stopped. False otherwise.
@ -377,13 +377,8 @@ class TestNode():
return False return False
# process has stopped. Assert that it didn't return an error code. # process has stopped. Assert that it didn't return an error code.
# unless 'expected_ret_code' is provided. assert return_code == expected_ret_code, self._node_msg(
if expected_ret_code is not None: f"Node returned unexpected exit code ({return_code}) vs ({expected_ret_code}) when stopping")
assert return_code == expected_ret_code, self._node_msg(
"Node returned unexpected exit code (%d) vs (%d) when stopping" % (return_code, expected_ret_code))
else:
assert return_code == 0, self._node_msg(
"Node returned non-zero exit code (%d) when stopping" % return_code)
self.running = False self.running = False
self.process = None self.process = None
self.rpc_connected = False self.rpc_connected = False
@ -392,7 +387,7 @@ class TestNode():
return True return True
def wait_until_stopped(self, timeout=BITCOIND_PROC_WAIT_TIMEOUT, expect_error=False): def wait_until_stopped(self, timeout=BITCOIND_PROC_WAIT_TIMEOUT, expect_error=False):
expected_ret_code = 1 if expect_error else None # Whether node shutdown return EXIT_FAILURE or EXIT_SUCCESS expected_ret_code = 1 if expect_error else 0 # Whether node shutdown return EXIT_FAILURE or EXIT_SUCCESS
wait_until_helper(lambda: self.is_node_stopped(expected_ret_code=expected_ret_code), timeout=timeout, timeout_factor=self.timeout_factor) wait_until_helper(lambda: self.is_node_stopped(expected_ret_code=expected_ret_code), timeout=timeout, timeout_factor=self.timeout_factor)
def replace_in_config(self, replacements): def replace_in_config(self, replacements):