Merge pull request #2700 from nicoddemus/staticmethods-fixtures

Allow tests declared as @staticmethod to use fixtures

1 files changed, 9 insertions, 1 deletions

diff --git a/_pytest/compat.py b/_pytest/compat.py
index 54271ce4f..255f69ce0 100644
--- a/_pytest/compat.py
+++ b/_pytest/compat.py
@@ -83,7 +83,15 @@ def num_mock_patch_args(function):
     return len(patchings)
 
 
-def getfuncargnames(function, startindex=None):
+def getfuncargnames(function, startindex=None, cls=None):
+    """
+    @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 function object well after collection has occurred.
+    """
+    if startindex is None and cls is not None:
+        is_staticmethod = isinstance(cls.__dict__.get(function.__name__, None), staticmethod)
+        startindex = 0 if is_staticmethod else 1
     # XXX merge with main.py's varnames
     # assert not isclass(function)
     realfunction = function