sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove Dash specific leftovers of node.stop optimization

Browse Source
This commit is contained in:
Alexander Block 2019-09-23 21:17:14 +02:00
parent f55da3aa54
commit cc124c99c7
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/functional/test_framework/test_framework.py
View File

@ -263,13 +263,13 @@ class BitcoinTestFramework(object):
return nodes return nodes
def stop_node(self, i, wait=True): def stop_node(self, i):
"""Stop a dashd test node""" """Stop a dashd test node"""
self.nodes[i].stop_node() self.nodes[i].stop_node()
while not self.nodes[i].is_node_stopped(): while not self.nodes[i].is_node_stopped():
time.sleep(0.1) time.sleep(0.1)
def stop_nodes(self, fast=True): def stop_nodes(self):
"""Stop multiple dashd test nodes""" """Stop multiple dashd test nodes"""
for node in self.nodes: for node in self.nodes:
# Issue RPC to stop nodes # Issue RPC to stop nodes
@ -301,11 +301,6 @@ class BitcoinTestFramework(object):
assert_msg = "dashd should have exited with expected error " + expected_msg assert_msg = "dashd should have exited with expected error " + expected_msg
raise AssertionError(assert_msg) raise AssertionError(assert_msg)
def wait_node(self, i):
return_code = self.bitcoind_processes[i].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
del self.bitcoind_processes[i]
assert_equal(return_code, 0)
def wait_for_node_exit(self, i, timeout): def wait_for_node_exit(self, i, timeout):
self.nodes[i].process.wait(timeout) self.nodes[i].process.wait(timeout)