fix dynamic labels and links (fixes #170 via #173)

Author: sseliverstov

allure-behave/src/listener.py

@@ -105,7 +105,10 @@ def stop_test(self, parent_uuid, uuid, name, context, exc_type, exc_val, exc_tb)
         self.flush_steps()
         status = scenario_status(scenario)
         status_details = scenario_status_details(scenario)
-        self.logger.update_test(uuid, stop=now(), status=status, statusDetails=status_details)
+        test_result = self.logger.get_test(uuid)
+        test_result.stop = now()
+        test_result.status = status
+        test_result.statusDetails = status_details
         self.logger.close_test(uuid)
         self.current_step_uuid = None
 

allure-pytest/src/listener.py

@@ -73,7 +73,9 @@ def pytest_runtest_protocol(self, item, nextitem):
         yield
 
         for name, value in item.callspec.params.items() if hasattr(item, 'callspec') else ():
-            self.allure_logger.update_test(uuid, parameters=Parameter(name, represent(value)))
+            test_result = self.allure_logger.get_test(uuid)
+            if test_result:
+                test_result.parameters.append(Parameter(name, represent(value)))
 
         test_case.labels.extend([Label(name=name, value=value) for name, value in allure_labels(item)])
         test_case.labels.extend([Label(name=LabelType.TAG, value=value) for value in pytest_markers(item)])
@@ -94,11 +96,14 @@ def pytest_runtest_protocol(self, item, nextitem):
     @pytest.hookimpl(hookwrapper=True)
     def pytest_runtest_call(self, item):
         uuid = self._cache.get(item.nodeid)
-        self.allure_logger.update_test(uuid, start=now())
+        test_result = self.allure_logger.get_test(uuid)
+        if test_result:
+            test_result.start = now()
 
         yield
 
-        self.allure_logger.update_test(uuid, stop=now())
+        if test_result:
+            test_result.stop = now()
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_fixture_setup(self, fixturedef, request):
@@ -170,10 +175,13 @@ def pytest_runtest_makereport(self, item, call):
             if report.failed and status == Status.PASSED:
                 status = Status.BROKEN
 
-        if status_details:
-            self.allure_logger.update_test(uuid, status=status, statusDetails=status_details)
-        else:
-            self.allure_logger.update_test(uuid, status=status)
+        test_result = self.allure_logger.get_test(uuid)
+        if test_result:
+            if status_details:
+                test_result.status = status
+                test_result.statusDetails = status_details
+            else:
+                test_result.status = status
 
     @allure_commons.hookimpl
     def attach_data(self, body, name, attachment_type, extension):
@@ -185,12 +193,15 @@ def attach_file(self, source, name, attachment_type, extension):
 
     @allure_commons.hookimpl
     def add_link(self, url, link_type, name):
-        self.allure_logger.update_test(None, links=Link(link_type, url, name))
+        test_result = self.allure_logger.get_test(None)
+        if test_result:
+            test_result.links.append(Link(link_type, url, name))
 
     @allure_commons.hookimpl
     def add_label(self, label_type, labels):
-        for label in labels:
-            self.allure_logger.update_test(None, labels=Label(label_type, label))
+        test_result = self.allure_logger.get_test(None)
+        for label in labels if test_result else ():
+            test_result.labels.append(Label(label_type, label))
 
 
 class ItemCache(object):

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

@@ -0,0 +1,30 @@
+import allure
+import pytest
+
+
+@allure.feature('first feature')
+def test_dynamic_feature():
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_dynamic_feature',
+    ...                           has_feature('first feature'),
+    ...                           has_feature('second feature')
+    ...             )
+    ... )
+    """
+    allure.dynamic.feature('second feature')
+
+
+@pytest.mark.parametrize('feature', ['first feature', 'second feature'])
+def test_parametrized_dynamic_feature(feature):
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> for feature in ['first feature', 'second feature']:
+    ...     assert_that(allure_report,
+    ...                 has_test_case('test_parametrized_dynamic_feature[{feature}]'.format(feature=feature),
+    ...                               has_feature(feature)
+    ...                 )
+    ...     )
+    """
+    allure.dynamic.feature(feature)

allure-pytest/test/links/dynamic_links_test.py

@@ -1,3 +1,4 @@
+import pytest
 import allure
 
 LINK_1 = "https://github.com"
@@ -15,3 +16,17 @@ def test_dynamic_links():
     ...             ))
     """
     allure.dynamic.link(LINK_2)
+
+
+@pytest.mark.parametrize('link', (LINK_1, LINK_2))
+def test_parametrized_dynamic_links(link):
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> for link in [LINK_1, LINK_2]:
+    ...     assert_that(allure_report,
+    ...                 has_test_case('test_parametrized_dynamic_links[{link}]'.format(link=link),
+    ...                               has_link(link)
+    ...                 )
+    ...     )
+    """
+    allure.dynamic.link(link)

allure-pytest/tox.ini

@@ -44,7 +44,7 @@ commands =
 #    `tox -e demo -- -k test_single_feature_label` or
 #    `tox -e demo -- ./test/steps/`
 [testenv:demo]
-basepython = python3.5
+#basepython = python3.5
 
 passenv = HOME
 

allure-python-commons/src/reporter.py

@@ -2,6 +2,7 @@
 
 from allure_commons.types import AttachmentType
 from allure_commons.model2 import ExecutableItem
+from allure_commons.model2 import TestResult
 from allure_commons.model2 import Attachment, ATTACHMENT_PATTERN
 from allure_commons.utils import now
 from allure_commons._core import plugin_manager
@@ -28,6 +29,11 @@ def _last_executable(self):
     def get_item(self, uuid):
         return self._items.get(uuid)
 
+    def get_last_item(self, item_type):
+        for _uuid in reversed(self._items):
+            if type(self._items[_uuid]) == item_type:
+                return self._items.get(_uuid)
+
     def start_group(self, uuid, group):
         self._items[uuid] = group
 
@@ -59,8 +65,8 @@ def stop_after_fixture(self, uuid, **kwargs):
     def schedule_test(self, uuid, test_case):
         self._items[uuid] = test_case
 
-    def update_test(self, uuid, **kwargs):
-        self._update_item(uuid, **kwargs)
+    def get_test(self, uuid):
+        return self.get_item(uuid) if uuid else self.get_last_item(TestResult)
 
     def close_test(self, uuid):
         test_case = self._items.pop(uuid)