diff options
author | MarcoFalke <falke.marco@gmail.com> | 2016-10-03 10:12:28 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2016-10-03 10:12:42 +0200 |
commit | 76f3c02fb01a6df98fbd8c16ac21d159d4649d37 (patch) | |
tree | b29ab0e61beb75a9204d59777fe13a89dcfcf47c /qa/rpc-tests/test_framework/test_framework.py | |
parent | eafc5f4fae52a16ad7343f7fb13bfecf9b62310a (diff) | |
parent | fa7c35c4ec630838178b4674288da33561a66f08 (diff) | |
download | bitcoin-76f3c02fb01a6df98fbd8c16ac21d159d4649d37.tar.xz |
Merge #8860: [qa] util: Move wait_bitcoinds() into stop_nodes()
fa7c35c [qa] util: Move wait_bitcoinds() into stop_nodes() (MarcoFalke)
Diffstat (limited to 'qa/rpc-tests/test_framework/test_framework.py')
-rwxr-xr-x | qa/rpc-tests/test_framework/test_framework.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py index 186cf866cf..e6fc5fd8a2 100755 --- a/qa/rpc-tests/test_framework/test_framework.py +++ b/qa/rpc-tests/test_framework/test_framework.py @@ -21,7 +21,6 @@ from .util import ( sync_mempools, stop_nodes, stop_node, - wait_bitcoinds, enable_coverage, check_json_precision, initialize_chain_clean, @@ -81,7 +80,6 @@ class BitcoinTestFramework(object): """ assert not self.is_network_split stop_nodes(self.nodes) - wait_bitcoinds() self.setup_network(True) def sync_all(self): @@ -100,7 +98,6 @@ class BitcoinTestFramework(object): """ assert self.is_network_split stop_nodes(self.nodes) - wait_bitcoinds() self.setup_network(False) def main(self): @@ -170,7 +167,6 @@ class BitcoinTestFramework(object): if not self.options.noshutdown: print("Stopping nodes") stop_nodes(self.nodes) - wait_bitcoinds() else: print("Note: bitcoinds were not stopped and may still be running") |