From d98d655094388e8e804b2d0539e350a99370c688 Mon Sep 17 00:00:00 2001
From: Ryan Wooden <rygwdn@gmail.com>
Date: Fri, 26 Feb 2016 08:14:55 -0400
Subject: [PATCH] Simplify IndexError test.

---
 AUTHORS                |  1 +
 CHANGELOG.rst          |  8 +++----
 testing/test_runner.py | 53 ++++++++++++++----------------------------
 3 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 1b3cbaf57..0bf529f02 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -69,6 +69,7 @@ Ralf Schmitt
 Raphael Pierzina
 Ronny Pfannschmidt
 Ross Lawley
+Ryan Wooden
 Samuele Pedroni
 Tom Viner
 Trevor Bekolay
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 13c9774ac..1d83e6b7b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -30,7 +30,9 @@
 
 *
 
-*
+* catch IndexError exceptions when getting exception source location. This fixes
+  pytest internal error for dynamically generated code (fixtures and tests)
+  where source lines are fake by intention
 
 *
 
@@ -526,10 +528,6 @@
   directories created by this fixture (defaults to $TEMP/pytest-$USER).
   Thanks Bruno Oliveira for the PR.
 
-- catch IndexError exceptions when getting exception source location. This fixes
-  pytest internal error for dynamically generated code (fixtures and tests)
-  where source lines are fake by intention
-
 2.7.2 (compared to 2.7.1)
 =============================
 
diff --git a/testing/test_runner.py b/testing/test_runner.py
index 7edffee4e..c3c415e0f 100644
--- a/testing/test_runner.py
+++ b/testing/test_runner.py
@@ -568,47 +568,30 @@ def test_makereport_getsource(testdir):
     result.stdout.fnmatch_lines(['*else: assert False*'])
 
 
-def test_makereport_getsource_dynamic_code(testdir):
+def test_makereport_getsource_dynamic_code(testdir, monkeypatch):
     """Test that exception in dynamically generated code doesn't break getting the source line."""
-    sub = testdir.mkdir("sub")
-    sub.join("__init__.py").write("")
-    sub.join("fixtures.py").write(py.std.textwrap.dedent(
-    """
-import sys
-import pytest
-import inspect
+    import inspect
+    original_findsource = inspect.findsource
+    def findsource(obj, *args, **kwargs):
+        # Can be triggered by dynamically created functions
+        if obj.__name__ == 'foo':
+            raise IndexError()
+        return original_findsource(obj, *args, **kwargs)
+    monkeypatch.setattr(inspect, 'findsource', findsource)
 
-def get_caller_module(depth=2):
-    frame = sys._getframe(depth)
-    module = inspect.getmodule(frame)
-    if module is None:
-        return get_caller_module(depth=depth)
-    return module
+    testdir.makepyfile("""
+        import pytest
 
-def inject():
-    context = {}
-    exec('''
-import pytest
+        @pytest.fixture
+        def foo(missing):
+            pass
 
-@pytest.fixture
-def foo(request):
-    request.getfuncargvalue('sone')
-''', context)
-    module = get_caller_module()
-    foo = context['foo']
-    module.foo = foo
-
-inject()
-    """))
-    sub.join("conftest.py").write("""from fixtures import foo""")
-    sub.join("test_dynamic.py").write(py.std.textwrap.dedent(
-        """
-def test_foo(foo):
-    pass
-        """))
+        def test_fix(foo):
+            assert False
+    """)
     result = testdir.runpytest('-vv')
     assert 'INTERNALERROR' not in result.stdout.str()
-    result.stdout.fnmatch_lines(['*else: assert False*'])
+    result.stdout.fnmatch_lines(["*test_fix*", "*fixture*'missing'*not found*"])
 
 
 def test_store_except_info_on_eror():