[qa] Stop other nodes, even when one fails to stop
This commit is contained in:
parent
2222dae6e3
commit
fafb33cdef
1 changed files with 9 additions and 2 deletions
|
@ -16,6 +16,7 @@ from binascii import hexlify, unhexlify
|
||||||
from base64 import b64encode
|
from base64 import b64encode
|
||||||
from decimal import Decimal, ROUND_DOWN
|
from decimal import Decimal, ROUND_DOWN
|
||||||
import json
|
import json
|
||||||
|
import http.client
|
||||||
import random
|
import random
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
|
@ -316,13 +317,19 @@ def log_filename(dirname, n_node, logname):
|
||||||
return os.path.join(dirname, "node"+str(n_node), "regtest", logname)
|
return os.path.join(dirname, "node"+str(n_node), "regtest", logname)
|
||||||
|
|
||||||
def stop_node(node, i):
|
def stop_node(node, i):
|
||||||
node.stop()
|
try:
|
||||||
|
node.stop()
|
||||||
|
except http.client.CannotSendRequest as e:
|
||||||
|
print("WARN: Unable to stop node: " + repr(e))
|
||||||
bitcoind_processes[i].wait()
|
bitcoind_processes[i].wait()
|
||||||
del bitcoind_processes[i]
|
del bitcoind_processes[i]
|
||||||
|
|
||||||
def stop_nodes(nodes):
|
def stop_nodes(nodes):
|
||||||
for node in nodes:
|
for node in nodes:
|
||||||
node.stop()
|
try:
|
||||||
|
node.stop()
|
||||||
|
except http.client.CannotSendRequest as e:
|
||||||
|
print("WARN: Unable to stop node: " + repr(e))
|
||||||
del nodes[:] # Emptying array closes connections as a side effect
|
del nodes[:] # Emptying array closes connections as a side effect
|
||||||
|
|
||||||
def set_node_times(nodes, t):
|
def set_node_times(nodes, t):
|
||||||
|
|
Loading…
Reference in a new issue