ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-23 14:52:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to report the child process output

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-01-24 14:48:09 -05:00
parent 7e9e447d5b
commit bedf092ca3
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
integration/conftest.py
View File

@ -10,7 +10,10 @@ from tempfile import mkdtemp, mktemp
from twisted.python.procutils import which from twisted.python.procutils import which
from twisted.internet.defer import Deferred, DeferredList from twisted.internet.defer import Deferred, DeferredList
from twisted.internet.task import deferLater from twisted.internet.task import deferLater
from twisted.internet.error import ProcessExitedAlready from twisted.internet.error import (
ProcessExitedAlready,
ProcessTerminated,
)
import pytest import pytest
@ -476,7 +479,12 @@ def tor_network(reactor, temp_dir, chutney, request):
path=join(chutney_dir), path=join(chutney_dir),
env={"PYTHONPATH": join(chutney_dir, "lib")}, env={"PYTHONPATH": join(chutney_dir, "lib")},
) )
pytest.blockon(proto.done) try:
pytest.blockon(proto.done)
except ProcessTerminated:
print("Chutney.TorNet failed:")
print(proto.output.getvalue())
raise
def cleanup(): def cleanup():
print("Tearing down Chutney Tor network") print("Tearing down Chutney Tor network")