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/util.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/util.py')
-rw-r--r-- | qa/rpc-tests/test_framework/util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 2f0d909a6e..c6b0367b41 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -266,7 +266,6 @@ def initialize_chain(test_dir, num_nodes, cachedir): # Shut them down, and clean up cache directories: stop_nodes(rpcs) - wait_bitcoinds() disable_mocktime() for i in range(MAX_NODES): os.remove(log_filename(cachedir, i, "debug.log")) @@ -365,6 +364,7 @@ def stop_nodes(nodes): except http.client.CannotSendRequest as e: print("WARN: Unable to stop node: " + repr(e)) del nodes[:] # Emptying array closes connections as a side effect + wait_bitcoinds() def set_node_times(nodes, t): for node in nodes: |