aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

test-fixtures: return error set, don't throw exception

Browse Source 
Throwing an exception while killing all nodes meant that
we aren't cleaning up all the nodes properly. Instead,
collect the errors, and return them back to the upper level,
where we report them and terminate as expected.
This commit is contained in:
lisa neigut
2019-09-04 12:11:51 -05:00
committed by Rusty Russell
parent 63c80e7aa9
commit df1d92a7a2
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/fixtures.py
View File

@@ -109,7 +109,7 @@ def node_factory(request, directory, test_name, bitcoind, executor):
nf = NodeFactory(test_name, bitcoind, executor, directory=directory)
yield nf
err_count = 0
ok = nf.killall([not n.may_fail for n in nf.nodes])
ok, errs = nf.killall([not n.may_fail for n in nf.nodes])
def check_errors(request, err_count, msg):
"""Just a simple helper to format a message, set flags on request and then raise
@@ -147,7 +147,7 @@ def node_factory(request, directory, test_name, bitcoind, executor):
for node in nf.nodes:
err_count += checkMemleak(node)
if err_count:
raise ValueError("{} nodes had memleak messages".format(err_count))
raise ValueError("{} nodes had memleak messages \n{}".format(err_count, '\n'.join(errs)))
for node in [n for n in nf.nodes if not n.allow_broken_log]:
err_count += checkBroken(node)
@@ -155,7 +155,7 @@ def node_factory(request, directory, test_name, bitcoind, executor):
if not ok:
request.node.has_errors = True
raise Exception("At least one lightning exited with unexpected non-zero return code")
raise Exception("At least one lightning node exited with unexpected non-zero return code\n Recorded errors: {}".format('\n'.join(errs)))
def getValgrindErrors(node):