Fix tests

Author: Glyphack

src/_pytest/compat.py

@@ -117,6 +117,10 @@ def getfuncargnames(
 
     The name parameter should be the original name in which the function was collected.
     """
+    # if name == "session_request":
+    #     import pdb
+    #     breakpoint()
+
     # TODO(RonnyPfannschmidt): This function should be refactored when we
     # revisit fixtures. The fixture mechanism should ask the node for
     # the fixture names, and not try to obtain directly from the
@@ -234,6 +238,20 @@ def get_real_func(obj):
     return obj
 
 
+def get_real_method(obj, holder):
+    """Attempt to obtain the real function object that might be wrapping
+    ``obj``, while at the same time returning a bound method to ``holder`` if
+    the original object was a bound method."""
+    try:
+        is_method = hasattr(obj, "__func__")
+        obj = get_real_func(obj)
+    except Exception:  # pragma: no cover
+        return obj
+    if is_method and hasattr(obj, "__get__") and callable(obj.__get__):
+        obj = obj.__get__(holder)
+    return obj
+
+
 def getimfunc(func):
     try:
         return func.__func__

src/_pytest/fixtures.py

@@ -44,6 +44,7 @@
 from _pytest._io import TerminalWriter
 from _pytest.compat import assert_never
 from _pytest.compat import get_real_func
+from _pytest.compat import get_real_method
 from _pytest.compat import getfuncargnames
 from _pytest.compat import getimfunc
 from _pytest.compat import getlocation
@@ -1743,12 +1744,15 @@ def parsefactories(
             # access below can raise. safe_getattr() ignores such exceptions.
             obj_ub = safe_getattr(holderobj_tp, name, None)
             if isinstance(obj_ub, FixtureFunctionDefinition):
-                marker = getfixturemarker(obj_ub)
-                if marker is None:
-                    raise Exception("marker was none")
+                marker = obj_ub._fixture_function_marker
                 if marker.name:
                     name = marker.name
-                func = get_real_func(obj_ub)
+
+                # OK we know it is a fixture -- now safe to look up on the _instance_.
+                obj = getattr(holderobj_tp, name)
+
+                func = get_real_method(obj, holderobj)
+
                 self._register_fixture(
                     name=name,
                     nodeid=nodeid,