fix pytest markers warning (fixes #381 via #397)

Author: sseliverstov

allure-pytest/setup.py

@@ -26,7 +26,7 @@
 ]
 
 install_requires = [
-    "pytest>=3.4.0",
+    "pytest>=4.5.0",
     "six>=1.9.0",
     "allure-python-commons==2.6.5"
 ]

allure-pytest/src/helper.py

@@ -3,9 +3,9 @@
 
 import pytest
 import allure_commons
-from allure_pytest.utils import ALLURE_TITLE
-from allure_pytest.utils import ALLURE_DESCRIPTION, ALLURE_DESCRIPTION_HTML
-from allure_pytest.utils import ALLURE_LABEL_PREFIX, ALLURE_LINK_PREFIX
+from allure_pytest.utils import ALLURE_DISPLAY_NAME_MARK
+from allure_pytest.utils import ALLURE_DESCRIPTION_MARK, ALLURE_DESCRIPTION_HTML_MARK
+from allure_pytest.utils import ALLURE_LABEL_MARK, ALLURE_LINK_MARK
 
 
 class AllureTestHelper(object):
@@ -15,34 +15,28 @@ def __init__(self, config):
 
     @allure_commons.hookimpl
     def decorate_as_title(self, test_title):
-        allure_title = getattr(pytest.mark, ALLURE_TITLE)
+        allure_title = getattr(pytest.mark, ALLURE_DISPLAY_NAME_MARK)
         return allure_title(test_title)
 
     @allure_commons.hookimpl
     def decorate_as_description(self, test_description):
-        allure_description = getattr(pytest.mark, ALLURE_DESCRIPTION)
+        allure_description = getattr(pytest.mark, ALLURE_DESCRIPTION_MARK)
         return allure_description(test_description)
 
     @allure_commons.hookimpl
     def decorate_as_description_html(self, test_description_html):
-        allure_description_html = getattr(pytest.mark, ALLURE_DESCRIPTION_HTML)
+        allure_description_html = getattr(pytest.mark, ALLURE_DESCRIPTION_HTML_MARK)
         return allure_description_html(test_description_html)
 
     @allure_commons.hookimpl
     def decorate_as_label(self, label_type, labels):
-        allure_label_marker = '{prefix}.{label_type}'.format(prefix=ALLURE_LABEL_PREFIX, label_type=label_type)
-        allure_label = getattr(pytest.mark, allure_label_marker)
+        allure_label = getattr(pytest.mark, ALLURE_LABEL_MARK)
         return allure_label(*labels, label_type=label_type)
 
     @allure_commons.hookimpl
     def decorate_as_link(self, url, link_type, name):
-        allure_link_marker = '{prefix}.{link_type}:{postfix}'.format(
-            prefix=ALLURE_LINK_PREFIX,
-            link_type=link_type,
-            postfix=url
-        )
         pattern = dict(self.config.option.allure_link_pattern).get(link_type, u'{}')
         url = pattern.format(url)
-        allure_link = getattr(pytest.mark, allure_link_marker)
+        allure_link = getattr(pytest.mark, ALLURE_LINK_MARK)
         name = url if name is None else name
         return allure_link(url, name=name, link_type=link_type)

allure-pytest/src/plugin.py

@@ -11,6 +11,10 @@
 from allure_pytest.helper import AllureTestHelper
 from allure_pytest.listener import AllureListener
 
+from allure_pytest.utils import ALLURE_DISPLAY_NAME_MARK
+from allure_pytest.utils import ALLURE_DESCRIPTION_MARK, ALLURE_DESCRIPTION_HTML_MARK
+from allure_pytest.utils import ALLURE_LABEL_MARK, ALLURE_LINK_MARK
+
 
 def pytest_addoption(parser):
     parser.getgroup("reporting").addoption('--alluredir',
@@ -126,6 +130,12 @@ def pytest_configure(config):
         allure_commons.plugin_manager.register(file_logger)
         config.add_cleanup(cleanup_factory(file_logger))
 
+    config.addinivalue_line("markers", "{mark}: allure label marker".format(mark=ALLURE_LABEL_MARK))
+    config.addinivalue_line("markers", "{mark}: allure link marker".format(mark=ALLURE_LINK_MARK))
+    config.addinivalue_line("markers", "{mark}: allure test name marker".format(mark=ALLURE_DISPLAY_NAME_MARK))
+    config.addinivalue_line("markers", "{mark}: allure description".format(mark=ALLURE_DESCRIPTION_MARK))
+    config.addinivalue_line("markers", "{mark}: allure description html".format(mark=ALLURE_DESCRIPTION_HTML_MARK))
+
 
 def pytest_collection_modifyitems(items, config):
     arg_labels = set().union(config.option.allure_epics,

allure-pytest/src/utils.py

@@ -10,11 +10,11 @@
 from allure_commons.model2 import StatusDetails
 from allure_commons.types import LabelType
 
-ALLURE_TITLE = 'allure_title'
-ALLURE_DESCRIPTION = 'allure_description'
-ALLURE_DESCRIPTION_HTML = 'allure_description_html'
-ALLURE_LABEL_PREFIX = 'allure_label'
-ALLURE_LINK_PREFIX = 'allure_link'
+ALLURE_DISPLAY_NAME_MARK = 'allure_display_name'
+ALLURE_DESCRIPTION_MARK = 'allure_description'
+ALLURE_DESCRIPTION_HTML_MARK = 'allure_description_html'
+ALLURE_LABEL_MARK = 'allure_label'
+ALLURE_LINK_MARK = 'allure_link'
 ALLURE_UNIQUE_LABELS = [
     LabelType.SEVERITY,
     LabelType.FRAMEWORK,
@@ -31,41 +31,41 @@ def get_marker_value(item, keyword):
 
 
 def allure_title(item):
-    return get_marker_value(item, ALLURE_TITLE)
+    return get_marker_value(item, ALLURE_DISPLAY_NAME_MARK)
 
 
 def allure_description(item):
-    description = get_marker_value(item, ALLURE_DESCRIPTION)
+    description = get_marker_value(item, ALLURE_DESCRIPTION_MARK)
     if description:
         return description
     elif hasattr(item, 'function'):
         return item.function.__doc__
 
 
 def allure_description_html(item):
-    return get_marker_value(item, ALLURE_DESCRIPTION_HTML)
+    return get_marker_value(item, ALLURE_DESCRIPTION_HTML_MARK)
 
 
 def allure_labels(item):
-    for keyword in item.keywords.keys():
-        if keyword.startswith(ALLURE_LABEL_PREFIX):
-            marker = item.get_closest_marker(keyword)
-            label_type = marker.kwargs['label_type']
-            if label_type in ALLURE_UNIQUE_LABELS:
-                yield (label_type, marker.args[0])
-            else:
-                for value in marker.args:
-                    yield (label_type, value)
+    unique_labels = dict()
+    labels = set()
+    for mark in item.iter_markers(name=ALLURE_LABEL_MARK):
+        label_type = mark.kwargs["label_type"]
+        if label_type in ALLURE_UNIQUE_LABELS:
+            if label_type not in unique_labels.keys():
+                unique_labels[label_type] = mark.args[0]
+        else:
+            for arg in mark.args:
+                labels.add((label_type, arg))
+    for k, v in unique_labels.items():
+        labels.add((k, v))
+
+    return labels
 
 
 def allure_links(item):
-    for keyword in item.keywords.keys():
-        if keyword.startswith(ALLURE_LINK_PREFIX):
-            marker = item.get_closest_marker(keyword)
-            link_type = marker.kwargs['link_type']
-            url = marker.args[0]
-            name = marker.kwargs['name']
-            yield (link_type, url, name)
+    for mark in item.iter_markers(name=ALLURE_LINK_MARK):
+        yield (mark.kwargs["link_type"], mark.args[0], mark.kwargs["name"])
 
 
 def pytest_markers(item):