diff options
Diffstat (limited to 'qa/rpc-tests/util.py')
-rw-r--r-- | qa/rpc-tests/util.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py index 87baadc5d6..6d0b21c927 100644 --- a/qa/rpc-tests/util.py +++ b/qa/rpc-tests/util.py @@ -1,5 +1,5 @@ # Copyright (c) 2014 The Bitcoin Core developers -# Distributed under the MIT/X11 software license, see the accompanying +# Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # # Helpful routines for regression testing @@ -110,11 +110,14 @@ def initialize_chain(test_dir): rpcs[i].setgenerate(True, 25) sync_blocks(rpcs) - # Shut them down, and remove debug.logs: + # Shut them down, and clean up cache directories: stop_nodes(rpcs) wait_bitcoinds() for i in range(4): - os.remove(debug_log("cache", i)) + os.remove(log_filename("cache", i, "debug.log")) + os.remove(log_filename("cache", i, "db.log")) + os.remove(log_filename("cache", i, "peers.dat")) + os.remove(log_filename("cache", i, "fee_estimates.dat")) for i in range(4): from_dir = os.path.join("cache", "node"+str(i)) @@ -167,8 +170,8 @@ def start_nodes(num_nodes, dir, extra_args=None, rpchost=None): if extra_args is None: extra_args = [ None for i in range(num_nodes) ] return [ start_node(i, dir, extra_args[i], rpchost) for i in range(num_nodes) ] -def debug_log(dir, n_node): - return os.path.join(dir, "node"+str(n_node), "regtest", "debug.log") +def log_filename(dir, n_node, logname): + return os.path.join(dir, "node"+str(n_node), "regtest", logname) def stop_node(node, i): node.stop() @@ -194,6 +197,10 @@ def connect_nodes(from_connection, node_num): while any(peer['version'] == 0 for peer in from_connection.getpeerinfo()): time.sleep(0.1) +def connect_nodes_bi(nodes, a, b): + connect_nodes(nodes[a], b) + connect_nodes(nodes[b], a) + def find_output(node, txid, amount): """ Return index to output of txid with value amount |