zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[qa] Stop other nodes, even when one fails to stop

This commit is contained in:
MarcoFalke 2016-04-30 14:55:31 +02:00 committed by Jack Grigg
parent 065255d3cb
commit 5f13446dee
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
@ -373,13 +374,19 @@ def check_node(i):
return bitcoind_processes[i].returncode return bitcoind_processes[i].returncode
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):