use index if name is not available for finalizer (fixes #282 fixes #278 via #284)

Author: Sup3rGeo

allure-pytest/src/listener.py

@@ -136,7 +136,8 @@ def pytest_fixture_setup(self, fixturedef, request):
 
         finalizers = getattr(fixturedef, '_finalizers', [])
         for index, finalizer in enumerate(finalizers):
-            name = '{fixture}::{finalizer}'.format(fixture=fixturedef.argname, finalizer=finalizer.__name__)
+            name = '{fixture}::{finalizer}'.format(fixture=fixturedef.argname,
+                                                   finalizer=getattr(finalizer, "__name__", index))
             finalizers[index] = allure_commons.fixture(finalizer, parent_uuid=container_uuid, name=name)
 
     @pytest.hookimpl(hookwrapper=True)

allure-pytest/test/fixtures/function_scope/yield_fixture_test.py

@@ -0,0 +1,18 @@
+import pytest
+
+
+@pytest.fixture
+def fixture_one():
+    yield
+
+
+def test_yield_fixture(fixture_one):
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_yield_fixture',
+    ...                           with_status('passed')
+    ...             )
+    ... )
+    """
+    pass

allure-python-commons/src/utils.py

@@ -12,6 +12,53 @@
 import threading
 import traceback
 import collections
+from functools import partial
+
+
+def getargspec(func):
+    """
+    Used because getargspec for python 2.7 does not accept functools.partial
+    which is the type for pytest fixtures.
+
+    getargspec excerpted from:
+
+    sphinx.util.inspect
+    ~~~~~~~~~~~~~~~~~~~
+    Helpers for inspecting Python modules.
+    :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+
+    Like inspect.getargspec but supports functools.partial as well.
+    """
+    # type: (Any) -> Any
+    if inspect.ismethod(func):
+        func = func.__func__
+    parts = 0, ()  # type: Tuple[int, Tuple[unicode, ...]]
+    if type(func) is partial:
+        keywords = func.keywords
+        if keywords is None:
+            keywords = {}
+        parts = len(func.args), keywords.keys()
+        func = func.func
+    if not inspect.isfunction(func):
+        raise TypeError('%r is not a Python function' % func)
+    args, varargs, varkw = inspect.getargs(func.__code__)
+    func_defaults = func.__defaults__
+    if func_defaults is None:
+        func_defaults = []
+    else:
+        func_defaults = list(func_defaults)
+    if parts[0]:
+        args = args[parts[0]:]
+    if parts[1]:
+        for arg in parts[1]:
+            i = args.index(arg) - len(args)  # type: ignore
+            del args[i]
+            try:
+                del func_defaults[i]
+            except IndexError:
+                pass
+    return inspect.ArgSpec(args, varargs, varkw, func_defaults)  # type: ignore
 
 
 if six.PY3:
@@ -252,7 +299,7 @@ def func_parameters(func, *args, **kwargs):
 
     """
     parameters = {}
-    arg_spec = inspect.getargspec(func) if six.PY2 else inspect.getfullargspec(func)
+    arg_spec = getargspec(func) if six.PY2 else inspect.getfullargspec(func)
     arg_order = list(arg_spec.args)
     args_dict = dict(zip(arg_spec.args, args))