zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[qa] test_framework: Set wait-timeout for bitcoind procs

This commit is contained in:
MarcoFalke 2016-05-12 12:54:00 +02:00
parent 7c8558da36
commit fab5233fe6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qa/rpc-tests/test_framework/util.py
View File

@ -35,6 +35,8 @@ PORT_MIN = 11000
# The number of ports to "reserve" for p2p and rpc, each # The number of ports to "reserve" for p2p and rpc, each
PORT_RANGE = 5000 PORT_RANGE = 5000
BITCOIND_PROC_WAIT_TIMEOUT = 60
class PortSeed: class PortSeed:
# Must be initialized with a unique integer for each process # Must be initialized with a unique integer for each process
@ -325,7 +327,7 @@ def stop_node(node, i):
node.stop() node.stop()
except http.client.CannotSendRequest as e: except http.client.CannotSendRequest as e:
print("WARN: Unable to stop node: " + repr(e)) print("WARN: Unable to stop node: " + repr(e))
bitcoind_processes[i].wait() bitcoind_processes[i].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
del bitcoind_processes[i] del bitcoind_processes[i]
def stop_nodes(nodes): def stop_nodes(nodes):
@ -343,7 +345,7 @@ def set_node_times(nodes, t):
def wait_bitcoinds(): def wait_bitcoinds():
# Wait for all bitcoinds to cleanly exit # Wait for all bitcoinds to cleanly exit
for bitcoind in bitcoind_processes.values(): for bitcoind in bitcoind_processes.values():
bitcoind.wait() bitcoind.wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
bitcoind_processes.clear() bitcoind_processes.clear()
def connect_nodes(from_connection, node_num): def connect_nodes(from_connection, node_num):