p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ExceptionInfo.from_current: assert current exception

This commit is contained in:
Daniel Hahler 2019-03-23 00:29:36 +01:00
parent 15d608867d
commit 2d690b83bf
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/_pytest/_code/code.py
View File

@ -413,6 +413,7 @@ class ExceptionInfo(object):
to the exception message/``__str__()`` to the exception message/``__str__()``
""" """
tup = sys.exc_info() tup = sys.exc_info()
assert tup[0] is not None, "no current exception"
_striptext = "" _striptext = ""
if exprinfo is None and isinstance(tup[1], AssertionError): if exprinfo is None and isinstance(tup[1], AssertionError):
exprinfo = getattr(tup[1], "msg", None) exprinfo = getattr(tup[1], "msg", None)

4
testing/code/test_code.py
View File

@ -172,6 +172,10 @@ class TestExceptionInfo(object):
exci = _pytest._code.ExceptionInfo.from_current() exci = _pytest._code.ExceptionInfo.from_current()
assert exci.getrepr() assert exci.getrepr()
def test_from_current_with_missing(self):
with pytest.raises(AssertionError, match="no current exception"):
_pytest._code.ExceptionInfo.from_current()
class TestTracebackEntry(object): class TestTracebackEntry(object):
def test_getsource(self): def test_getsource(self):