mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

pytest: Valgrind errors trump exit value errors

Browse Source 
Raising the exception about non-zero exit values into the
teardown. This was previously masking the valgrind errors. Now
valgrind errors > crash errors > non-zero return value.

Still hoping to catch that elusive [7, 0] return value on travis.

Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker 2017-11-09 17:07:18 +01:00 committed by Rusty Russell
parent bab0693fc4
commit d6af14a869
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_lightningd.py
View File

@ -140,8 +140,8 @@ class NodeFactory(object):
except:
failed = True
rcs.append(n.daemon.proc.returncode)
if failed:
raise Exception("At least one lightning exited with non-zero return code: {}".format(rcs))
return rcs
class BaseLightningDTests(unittest.TestCase):
@ -190,7 +190,7 @@ class BaseLightningDTests(unittest.TestCase):
return 1 if errors else 0
def tearDown(self):
self.node_factory.killall()
rcs = self.node_factory.killall()
self.executor.shutdown(wait=False)
err_count = 0
@ -199,14 +199,18 @@ class BaseLightningDTests(unittest.TestCase):
for node in self.node_factory.nodes:
err_count += self.printValgrindErrors(node)
if err_count:
raise ValueError(
"{} nodes reported valgrind errors".format(err_count))
raise ValueError("{} nodes reported valgrind errors".format(err_count))
for node in self.node_factory.nodes:
err_count += self.printCrashLog(node)
if err_count:
raise ValueError(
"{} nodes had crash.log files".format(err_count))
raise ValueError("{} nodes had crash.log files".format(err_count))
# Which nodes may fail? Mask away the ones that we know will fail
failmask = [not n.may_fail for n in self.node_factory.nodes]
unexpected = [(failmask[i] * rcs[i]) for i in range(len(rcs))]
if len([u for u in unexpected if u > 0]) > 0:
raise Exception("At least one lightning exited with unexpected non-zero return code: {}".format(unexpected))
class LightningDTests(BaseLightningDTests):
def connect(self):