patch instance

Author: TvoroG

pytest_lazyfixture.py

@@ -23,6 +23,9 @@ def pytest_runtest_setup(item):
     if isinstance(item, TestCaseFunction):
         return
 
+    if isinstance(item.parent, Instance):
+        _patch_instance(item)
+
     fixturenames = item.fixturenames
     argnames = item._fixtureinfo.argnames
 
@@ -35,14 +38,6 @@ def pytest_runtest_setup(item):
             if is_lazy_fixture(val):
                 item.callspec.params[param] = item._request.getfixturevalue(val.name)
 
-    if isinstance(item.parent, Instance):
-        def newinstance(self):
-            return self.obj
-
-        item.parent.newinstance = types.MethodType(
-            newinstance, item.parent
-        )
-
 
 def pytest_runtest_call(item):
     if hasattr(item, 'funcargs'):
@@ -135,6 +130,18 @@ def get_nodeid(module, rootdir):
     return relpath
 
 
+def _patch_instance(item):
+    obj = Instance.newinstance(item.parent)
+    item.obj = item._getobj()
+
+    def newinstance(self):
+        return obj
+
+    item.parent.newinstance = types.MethodType(
+        newinstance, item.parent
+    )
+
+
 def lazy_fixture(names):
     if isinstance(names, string_type):
         return LazyFixture(names)

tests/test_lazyfixture.py

@@ -391,12 +391,15 @@ class TestModels(object):
             def setup(self):
                 self.var = 15
 
-            def test_model(self):
+            def test_model_a(self):
+                assert self.var == 15
+
+            def test_model_b(self):
                 assert self.var == 15
 
     """)
     reprec = testdir.inline_run('-s', '-v')
-    reprec.assertoutcome(passed=1)
+    reprec.assertoutcome(passed=2)
 
 
 def test_issues12_skip_test_function(testdir):