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

Merge pull request #4451 from asottile/report_correct_filename_raises_exec 

Fix `raises(..., "code(string)")` frame filename.
This commit is contained in:
Anthony Sottile 2018-11-23 17:29:09 -08:00 committed by GitHub
parent f75f2117d0 0d5298475d
commit 860bc50772
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/4435.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Fix ``raises(..., 'code(string)')`` frame filename.

2
src/_pytest/python_api.py
View File

@ -679,7 +679,7 @@ def raises(expected_exception, *args, **kwargs):
loc.update(kwargs) loc.update(kwargs)
# print "raises frame scope: %r" % frame.f_locals # print "raises frame scope: %r" % frame.f_locals
try: try:
code = _pytest._code.Source(code).compile() code = _pytest._code.Source(code).compile(_genframe=frame)
six.exec_(code, frame.f_globals, loc) six.exec_(code, frame.f_globals, loc)
# XXX didn't mean f_globals == f_locals something special? # XXX didn't mean f_globals == f_locals something special?
# this is destroyed here ... # this is destroyed here ...

4
testing/python/raises.py
View File

@ -17,6 +17,10 @@ class TestRaises(object):
def test_raises_exec(self): def test_raises_exec(self):
pytest.raises(ValueError, "a,x = []") pytest.raises(ValueError, "a,x = []")
def test_raises_exec_correct_filename(self):
excinfo = pytest.raises(ValueError, 'int("s")')
assert __file__ in excinfo.traceback[-1].path
def test_raises_syntax_error(self): def test_raises_syntax_error(self):
pytest.raises(SyntaxError, "qwe qwe qwe") pytest.raises(SyntaxError, "qwe qwe qwe")