floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1052 from The-Compiler/no-std-prefix 

Don't hardcode 'std' for captured stdout/stderr.
This commit is contained in:
holger krekel 2015-09-29 09:19:40 +02:00
parent a73d517bee c10f483b9f
commit f61f39efdd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_pytest/capture.py
View File

@ -147,8 +147,8 @@ class CaptureManager:
def suspendcapture_item(self, item, when): def suspendcapture_item(self, item, when):
out, err = self.suspendcapture() out, err = self.suspendcapture()
item.add_report_section(when, "out", out) item.add_report_section(when, "stdout", out)
item.add_report_section(when, "err", err) item.add_report_section(when, "stderr", err)
error_capsysfderror = "cannot use capsys and capfd at the same time" error_capsysfderror = "cannot use capsys and capfd at the same time"

2
_pytest/runner.py
View File

@ -226,7 +226,7 @@ def pytest_runtest_makereport(item, call):
longrepr = item._repr_failure_py(excinfo, longrepr = item._repr_failure_py(excinfo,
style=item.config.option.tbstyle) style=item.config.option.tbstyle)
for rwhen, key, content in item._report_sections: for rwhen, key, content in item._report_sections:
sections.append(("Captured std%s %s" %(key, rwhen), content)) sections.append(("Captured %s %s" %(key, rwhen), content))
return TestReport(item.nodeid, item.location, return TestReport(item.nodeid, item.location,
keywords, outcome, longrepr, when, keywords, outcome, longrepr, when,
sections, duration) sections, duration)