diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-05-20 17:33:46 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-05-20 17:34:11 +0200 |
| commit | 37f9a1f627c0995d89b62923e75cd092600894f9 (patch) | |
| tree | 0d38e9460581d64f96d1212ad679ee43dd9a5a62 /qa/rpc-tests/test_framework | |
| parent | 8844ef15ded02d5ed86fb95aaf251235fcef2396 (diff) | |
| parent | fab5233fe6c99d446a2cebc48cf479c3f026c2cc (diff) | |
Merge #8047: [qa] test_framework: Set wait-timeout for bitcoind procs
fab5233 [qa] test_framework: Set wait-timeout for bitcoind procs (MarcoFalke)
Diffstat (limited to 'qa/rpc-tests/test_framework')
| -rw-r--r-- | qa/rpc-tests/test_framework/util.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 0e522e78d4..3948b664e3 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -35,6 +35,8 @@ PORT_MIN = 11000 # The number of ports to "reserve" for p2p and rpc, each PORT_RANGE = 5000 +BITCOIND_PROC_WAIT_TIMEOUT = 60 + class PortSeed: # Must be initialized with a unique integer for each process @@ -332,7 +334,7 @@ def stop_node(node, i): node.stop() except http.client.CannotSendRequest as 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] def stop_nodes(nodes): @@ -350,7 +352,7 @@ def set_node_times(nodes, t): def wait_bitcoinds(): # Wait for all bitcoinds to cleanly exit for bitcoind in bitcoind_processes.values(): - bitcoind.wait() + bitcoind.wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT) bitcoind_processes.clear() def connect_nodes(from_connection, node_num): |