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

Removed unnecessary iteration in nose.pytest_runtest_makereport.

This commit is contained in:
schlamar 2014-03-14 15:29:42 +01:00
parent 77e1f93ca1
commit 85e7b11ef5
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
_pytest/nose.py
View File

@ -17,16 +17,11 @@ def get_skip_exceptions():
def pytest_runtest_makereport(__multicall__, item, call): def pytest_runtest_makereport(__multicall__, item, call):
if not call.excinfo: if call.excinfo and call.excinfo.errisinstance(get_skip_exceptions()):
return # let's substitute the excinfo with a pytest.skip one
call2 = call.__class__(lambda:
for skip_exc in get_skip_exceptions(): pytest.skip(str(call.excinfo.value)), call.when)
if call.excinfo.errisinstance(skip_exc): call.excinfo = call2.excinfo
# let's substitute the excinfo with a pytest.skip one
call2 = call.__class__(lambda:
pytest.skip(str(call.excinfo.value)), call.when)
call.excinfo = call2.excinfo
return
@pytest.mark.trylast @pytest.mark.trylast