[WIP] Pytest marks as tags (fixes #103 fixes #102 fixes #100 and really fixes #60) (#104)

pytest marks as tags (fixes #103 fixes #102 fixes #100 and really fixes #60 via #104)

Author: sseliverstov

allure-pytest/src/helper.py

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 import pytest
 import allure_commons
 from allure_pytest.utils import ALLURE_LABEL_PREFIX, ALLURE_LINK_PREFIX
@@ -10,14 +13,14 @@ def __init__(self, config):
 
     @allure_commons.hookimpl
     def decorate_as_label(self, label_type, labels):
-        allure_label_marker = u'{prefix}.{label_type}'.format(prefix=ALLURE_LABEL_PREFIX, label_type=label_type)
+        allure_label_marker = '{prefix}.{label_type}'.format(prefix=ALLURE_LABEL_PREFIX, label_type=label_type)
         allure_label = getattr(pytest.mark, allure_label_marker)
         return allure_label(*labels, label_type=label_type)
 
     @allure_commons.hookimpl
     def decorate_as_link(self, url, link_type, name):
-        allure_link_marker = u'{prefix}.{link_type}'.format(prefix=ALLURE_LINK_PREFIX, link_type=link_type)
+        allure_link_marker = '{prefix}.{link_type}'.format(prefix=ALLURE_LINK_PREFIX, link_type=link_type)
         pattern = dict(self.config.option.allure_link_pattern).get(link_type, u'{}')
         url = pattern.format(url)
         allure_link = getattr(pytest.mark, allure_link_marker)
-        return allure_link(url, name=name)
+        return allure_link(url, name=name, link_type=link_type)

allure-pytest/src/listener.py

@@ -13,9 +13,10 @@
 from allure_commons.model2 import Parameter
 from allure_commons.model2 import Label, Link
 from allure_commons.model2 import Status
+from allure_commons.types import LabelType
 
 from allure_pytest.utils import allure_parameters
-from allure_pytest.utils import allure_labels, allure_links
+from allure_pytest.utils import allure_labels, allure_links, pytest_markers
 from allure_pytest.utils import allure_full_name, allure_package
 
 
@@ -70,6 +71,8 @@ def pytest_runtest_protocol(self, item, nextitem):
 
         test_case.labels += [Label(name, value) for name, value in allure_labels(item)]
         test_case.links += [Link(link_type, url, name) for link_type, url, name in allure_links(item)]
+        test_case.labels += [Label(LabelType.TAG, value) for value in pytest_markers(item)]
+
         test_case.fullName = allure_full_name(item.nodeid)
         test_case.historyId = md5(test_case.fullName)
         test_case.labels.append(Label('package', allure_package(item.nodeid)))

allure-pytest/src/utils.py

@@ -1,7 +1,9 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 import os
-import sys
-import inspect
 from itertools import product
+from allure_commons.utils import represent
 
 ALLURE_UNIQUE_LABELS = ['severity', 'thread', 'host']
 ALLURE_LABEL_PREFIX = 'allure_label'
@@ -40,7 +42,7 @@ def allure_parameters(fixturedef, request):
                 if len(item['args']) == 1:
                     parameters = {'name': ids, 'value': str(request.param)}
                 else:
-                    param_name = u'{ids}::{param}'.format(ids=ids, param=param_name)
+                    param_name = '{ids}::{param}'.format(ids=ids, param=param_name)
                     parameters = {'name': param_name, 'value': str(request.param)}
 
     return parameters
@@ -62,12 +64,32 @@ def allure_links(item):
     for keyword in item.keywords.keys():
         if keyword.startswith(ALLURE_LINK_PREFIX):
             marker = item.get_marker(keyword)
-            link_type = marker.name.split('.', 1)[-1]
+            link_type = marker.kwargs['link_type']
             url = marker.args[0]
             name = marker.kwargs['name']
             yield (link_type, url, name)
 
 
+def pytest_markers(item):
+    for keyword in item.keywords.keys():
+        if not any((keyword.startswith(ALLURE_LINK_PREFIX),
+                    keyword.startswith(ALLURE_LABEL_PREFIX),
+                    keyword == 'parametrize')):
+            marker = item.get_marker(keyword)
+            if marker:
+                yield mark_to_str(marker)
+
+
+def mark_to_str(marker):
+    args = [represent(arg) for arg in marker.args]
+    kwargs = ['{name}={value}'.format(name=key, value=represent(marker.kwargs[key])) for key in marker.kwargs]
+    if args or kwargs:
+        parameters = ', '.join(args + kwargs)
+        return '@pytest.mark.{name}({parameters})'.format(name=marker.name, parameters=parameters)
+    else:
+        return '@pytest.mark.{name}'.format(name=marker.name)
+
+
 def allure_package(nodeid):
     parts = nodeid.split('::')
     path = parts[0].split('.')[0]
@@ -77,18 +99,6 @@ def allure_package(nodeid):
 def allure_full_name(nodeid):
     parts = nodeid.split('::')
     package = allure_package(nodeid)
-    clazz = u'.{clazz}'.format(clazz=parts[1]) if len(parts) > 2 else ''
+    clazz = '.{clazz}'.format(clazz=parts[1]) if len(parts) > 2 else ''
     test = parts[-1]
-    return u'{package}{clazz}#{test}'.format(package=package, clazz=clazz, test=test)
-
-
-def step_parameters(func, *a, **kw):
-    if sys.version_info.major < 3:
-        all_names = inspect.getargspec(func).args
-        defaults = inspect.getargspec(func).defaults
-    else:
-        all_names = inspect.getfullargspec(func).args
-        defaults = inspect.getfullargspec(func).defaults
-    args_part = [(n, str(v)) for n, v in zip(all_names, a)]
-    kwarg_part = [(n, str(kw[n]) if n in kw else str(defaults[i])) for i, n in enumerate(all_names[len(a):])]
-    return args_part + kwarg_part
+    return '{package}{clazz}#{test}'.format(package=package, clazz=clazz, test=test)

allure-pytest/test/history/simple_history_test.py

@@ -20,4 +20,4 @@ def test_history_id():
     ...             )
     ... )
     """
-    pytest.exit("Just test")
+    pass  # pytest.exit("Just test")

allure-pytest/test/labels/bdd/__init__.py

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+"""
+>>> allure_report = getfixture('allure_report')
+>>> assert_that(allure_report,
+...             all_of(
+...                 has_property('test_cases', has_length(3)),
+...                 has_property('test_groups', has_length(0))
+...             ))  # doctest: +SKIP
+"""
+
+import pytest
+
+
+@pytest.mark.cool
+@pytest.mark.stuff
+def test_pytest_marker():
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...                 has_test_case('test_pytest_marker',
+    ...                     has_tag('@pytest.mark.cool'),
+    ...                     has_tag('@pytest.mark.stuff')
+    ...                 )
+    ...             )
+    """
+    pass
+
+
+@pytest.mark.marker('cool', 'stuff')
+def test_pytest_marker_with_args():
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...                 has_test_case('test_pytest_marker_with_args',
+    ...                     has_tag("@pytest.mark.marker('cool', 'stuff')")
+    ...                 )
+    ...             )
+    """
+    pass
+
+
+@pytest.mark.marker(stuff='cool')
+def test_pytest_marker_with_kwargs():
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_pytest_marker_with_kwargs',
+    ...                           has_tag("@pytest.mark.marker(stuff='cool')")
+    ...                           )
+    ...             )
+    """
+    pass
+
+
+@pytest.mark.marker(stuff='я')
+def test_pytest_marker_with_kwargs_native_encoding():
+    """
+    >>> from allure_commons.utils import represent
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_pytest_marker_with_kwargs_native_encoding',
+    ...                           has_tag("@pytest.mark.marker(stuff=%s)" % represent('я'))
+    ...                          )
+    ...             )
+    """
+    pass
+
+
+@pytest.mark.marker(stuff=u'я')
+def test_pytest_marker_with_kwargs_utf_encoding():
+    """
+    >>> from allure_commons.utils import represent
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_pytest_marker_with_kwargs_utf_encoding',
+    ...                           has_tag("@pytest.mark.marker(stuff=%s)" % represent('я'))
+    ...                          )
+    ...             )
+    """
+    pass
+
+
+@pytest.mark.marker('that', stuff='cool')
+def test_pytest_marker_with_args_and_kwargs():
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_pytest_marker_with_args_and_kwargs',
+    ...                           has_tag("@pytest.mark.marker('that', stuff='cool')")
+    ...                          )
+    ...             )
+    """
+    pass