Merge master into merge-master-into-features

2018-11-24 13:47:10 +01:00
parent 33b877cc01 8facf1db90
commit 5bee396e4b
4 changed files with 9 additions and 11 deletions
--- a/src/_pytest/python_api.py
+++ b/src/_pytest/python_api.py
@@ -679,7 +679,7 @@ def raises(expected_exception, *args, **kwargs):
        loc.update(kwargs)
        # print "raises frame scope: %r" % frame.f_locals
        try:
-            code = _pytest._code.Source(code).compile()
+            code = _pytest._code.Source(code).compile(_genframe=frame)
            six.exec_(code, frame.f_globals, loc)
            # XXX didn't mean f_globals == f_locals something special?
            #     this is destroyed here ...