ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-18 15:28:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Infinite blocking is bad.

Browse Source
This commit is contained in:
Itamar Turner-Trauring
2021-01-12 13:58:28 -05:00
parent b74ec6919d
commit dfcd75f20d
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
integration/conftest.py
View File

@ -40,7 +40,8 @@ from util import (
TahoeProcess,
cli,
_run_node,
generate_ssh_key
generate_ssh_key,
block_with_timeout,
)
@ -156,7 +157,7 @@ def flog_gatherer(reactor, temp_dir, flog_binary, request):
)
print("Waiting for flogtool to complete")
try:
pytest_twisted.blockon(flog_protocol.done)
block_with_timeout(flog_protocol.done, reactor)
except ProcessTerminated as e:
print("flogtool exited unexpectedly: {}".format(str(e)))
print("Flogtool completed")
@ -297,7 +298,7 @@ log_gatherer.furl = {log_furl}
def cleanup():
try:
transport.signalProcess('TERM')
pytest_twisted.blockon(protocol.exited)
block_with_timeout(protocol.exited, reactor)
except ProcessExitedAlready:
pass
request.addfinalizer(cleanup)
@ -537,7 +538,7 @@ def tor_network(reactor, temp_dir, chutney, request):
env=env,
)
try:
pytest_twisted.blockon(proto.done)
block_with_timeout(proto.done, reactor)
except ProcessTerminated:
# If this doesn't exit cleanly, that's fine, that shouldn't fail
# the test suite.