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

teach trial support code to throw separate errors/failures for setup/call/teardown

Browse Source
This commit is contained in:
holger krekel
2010-11-24 14:35:04 +01:00
parent ff27d299cc
commit 10d4544267
2 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
_pytest/unittest.py
View File

@@ -47,7 +47,7 @@ class TestCaseFunction(pytest.Function):
# unwrap potential exception info (see twisted trial support below)
rawexcinfo = getattr(rawexcinfo, '_rawexcinfo', rawexcinfo)
try:
self._excinfo = py.code.ExceptionInfo(rawexcinfo)
excinfo = py.code.ExceptionInfo(rawexcinfo)
except TypeError:
try:
try:
@@ -63,7 +63,8 @@ class TestCaseFunction(pytest.Function):
except KeyboardInterrupt:
raise
except pytest.fail.Exception:
self._excinfo = py.code.ExceptionInfo()
excinfo = py.code.ExceptionInfo()
self.__dict__.setdefault('_excinfo', []).append(excinfo)
def addError(self, testcase, rawexcinfo):
self._addexcinfo(rawexcinfo)
@@ -80,9 +81,8 @@ class TestCaseFunction(pytest.Function):
@pytest.mark.tryfirst
def pytest_runtest_makereport(item, call):
if isinstance(item, TestCaseFunction):
if item._excinfo:
call.excinfo = item._excinfo
item._excinfo = None
if hasattr(item, '_excinfo') and item._excinfo:
call.excinfo = item._excinfo.pop(0)
del call.result
# twisted trial support