From cc124c99c7adeeb1fa9d713cff18f93b210edcf3 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Mon, 23 Sep 2019 21:17:14 +0200 Subject: [PATCH] Remove Dash specific leftovers of node.stop optimization --- test/functional/test_framework/test_framework.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 9618c7a73f..2d148ec433 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -263,13 +263,13 @@ class BitcoinTestFramework(object): return nodes - def stop_node(self, i, wait=True): + def stop_node(self, i): """Stop a dashd test node""" self.nodes[i].stop_node() while not self.nodes[i].is_node_stopped(): time.sleep(0.1) - def stop_nodes(self, fast=True): + def stop_nodes(self): """Stop multiple dashd test nodes""" for node in self.nodes: # Issue RPC to stop nodes @@ -301,11 +301,6 @@ class BitcoinTestFramework(object): assert_msg = "dashd should have exited with expected error " + expected_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): self.nodes[i].process.wait(timeout)