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

also accept non-pytrace pytest.fail() call in setup/teardown methods

This commit is contained in:
holger krekel 2010-11-24 16:43:55 +01:00
parent c36b20b137
commit 539f828cdd
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/python.py
View File

@ -324,14 +324,14 @@ class FunctionMixin(PyobjMixin):
if line.strip().startswith('def'): if line.strip().startswith('def'):
return FuncargLookupErrorRepr(fspath, lineno, return FuncargLookupErrorRepr(fspath, lineno,
lines[:i+1], str(excinfo.value)) lines[:i+1], str(excinfo.value))
if excinfo.errisinstance(pytest.fail.Exception):
if not excinfo.value.pytrace:
return str(excinfo.value)
return super(FunctionMixin, self)._repr_failure_py(excinfo, return super(FunctionMixin, self)._repr_failure_py(excinfo,
style=style) style=style)
def repr_failure(self, excinfo, outerr=None): def repr_failure(self, excinfo, outerr=None):
assert outerr is None, "XXX outerr usage is deprecated" assert outerr is None, "XXX outerr usage is deprecated"
if excinfo.errisinstance(pytest.fail.Exception):
if not excinfo.value.pytrace:
return str(excinfo.value)
return self._repr_failure_py(excinfo, return self._repr_failure_py(excinfo,
style=self.config.option.tbstyle) style=self.config.option.tbstyle)

6
testing/test_runner.py
View File

@ -339,11 +339,15 @@ def test_pytest_fail_notrace(testdir):
import pytest import pytest
def test_hello(): def test_hello():
pytest.fail("hello", pytrace=False) pytest.fail("hello", pytrace=False)
def teardown_function(function):
pytest.fail("world", pytrace=False)
""") """)
result = testdir.runpytest() result = testdir.runpytest()
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
"hello" "world",
"hello",
]) ])
assert 'def teardown_function' not in result.stdout.str()
def test_exception_printing_skip(): def test_exception_printing_skip():
try: try: