ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-17 23:08:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow an error exit status from flogtool dump

Browse Source 
If the flog is truncated, parsing it will fail and flogtool will exit with an
error.  There's no particular reason to allow this to fail a test.
This commit is contained in:
Jean-Paul Calderone
2019-02-15 13:46:25 -05:00
parent 02890fb205
commit f5b7058efe
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
integration/conftest.py
View File

@ -124,7 +124,12 @@ def flog_gatherer(reactor, temp_dir, flog_binary, request):
'flogtool', 'dump', join(temp_dir, 'flog_gather', flogs[0])
),
)
pytest_twisted.blockon(flog_protocol.done)
print("Waiting for flogtool to complete")
try:
pytest_twisted.blockon(flog_protocol.done)
except ProcessTerminated as e:
print("flogtool exited unexpectedly: {}".format(str(e)))
print("Flogtool completed")
request.addfinalizer(cleanup)