fix pytest/xdist issue485 (also depends on py-1.4.21.dev1):

attach stdout/stderr on --boxed processes that die.
This commit is contained in:
holger krekel
2014-03-26 18:33:09 +01:00
parent 3f33a2d23e
commit 4441002e95
5 changed files with 41 additions and 7 deletions

View File

@@ -1,2 +1,2 @@
#
__version__ = '1.10'
__version__ = '1.11.dev1'

View File

@@ -118,10 +118,14 @@ def forked_run_report(item):
def report_process_crash(item, result):
path, lineno = item._getfslineno()
info = "%s:%s: running the test CRASHED with signal %d" %(
path, lineno, result.signal)
info = ("%s:%s: running the test CRASHED with signal %d" %
(path, lineno, result.signal))
from _pytest import runner
call = runner.CallInfo(lambda: 0/0, "???")
call.excinfo = info
rep = runner.pytest_runtest_makereport(item, call)
if result.out:
rep.sections.append(("captured stdout", result.out))
if result.err:
rep.sections.append(("captured stderr", result.err))
return rep