D8881.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D8881.diff
View Options

	diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
	--- a/test/functional/test_framework/test_framework.py
	+++ b/test/functional/test_framework/test_framework.py
	@@ -462,13 +462,12 @@
	def stop_node(self, i, expected_stderr='', wait=0):
	"""Stop a bitcoind test node"""
	self.nodes[i].stop_node(expected_stderr, wait=wait)
	- self.nodes[i].wait_until_stopped()

	def stop_nodes(self, wait=0):
	"""Stop multiple bitcoind test nodes"""
	for node in self.nodes:
	# Issue RPC to stop nodes
	- node.stop_node(wait=wait)
	+ node.stop_node(wait=wait, wait_until_stopped=False)

	for node in self.nodes:
	# Wait for nodes to stop
	diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py
	--- a/test/functional/test_framework/test_node.py
	+++ b/test/functional/test_framework/test_node.py
	@@ -367,7 +367,8 @@
	wallet_path = "wallet/{}".format(urllib.parse.quote(wallet_name))
	return RPCOverloadWrapper(self.rpc / wallet_path)

	- def stop_node(self, expected_stderr='', wait=0):
	+ def stop_node(self, expected_stderr='', *, wait=0,
	+ wait_until_stopped=True):
	"""Stop the node."""
	if not self.running:
	return
	@@ -393,6 +394,9 @@

	del self.p2ps[:]

	+ if wait_until_stopped:
	+ self.wait_until_stopped()
	+
	def is_node_stopped(self):
	"""Checks whether the node has stopped.