aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests/test_framework/util.py
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-10-01 21:07:31 +0200
committerMarcoFalke <falke.marco@gmail.com>2016-10-03 11:31:36 +0200
commit0bee740845b9c7599e041b0be7111c8debaff63b (patch)
tree3a50e93f708fc7ec8f1f00868baf7d0b5ee4ebc7 /qa/rpc-tests/test_framework/util.py
parent794b007896aae7b180bdfc771bb4e1656a3e3329 (diff)
downloadbitcoin-0bee740845b9c7599e041b0be7111c8debaff63b.tar.xz
[qa] util: Move wait_bitcoinds() into stop_nodes()
Github-Pull: #8860 Rebased-From: fa7c35c4ec630838178b4674288da33561a66f08
Diffstat (limited to 'qa/rpc-tests/test_framework/util.py')
-rw-r--r--qa/rpc-tests/test_framework/util.py2
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 8aa34265c5..53db1cc492 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -262,7 +262,6 @@ def initialize_chain(test_dir, num_nodes):
# 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("cache", i, "debug.log"))
@@ -361,6 +360,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: