support template for display name (fixes #196 via #199)

Author: sseliverstov

allure-pytest/src/listener.py

@@ -65,30 +65,27 @@ def pytest_runtest_protocol(self, item, nextitem):
                 self.allure_logger.start_group(group_uuid, group)
             self.allure_logger.update_group(group_uuid, children=uuid)
 
-        test_case = TestResult(name=allure_name(item), uuid=uuid)
-        test_case.description = allure_description(item)
-        test_case.descriptionHtml = allure_description_html(item)
+        params = item.callspec.params if hasattr(item, 'callspec') else {}
 
-        self.allure_logger.schedule_test(uuid, test_case)
-        yield
-
-        for name, value in item.callspec.params.items() if hasattr(item, 'callspec') else ():
-            test_result = self.allure_logger.get_test(uuid)
-            if test_result:
-                test_result.parameters.append(Parameter(name, represent(value)))
+        test_result = TestResult(name=allure_name(item, params), uuid=uuid)
+        test_result.description = allure_description(item)
+        test_result.descriptionHtml = allure_description_html(item)
+        test_result.fullName = allure_full_name(item)
+        test_result.historyId = md5(test_result.fullName)
+        test_result.parameters.extend([Parameter(name=name, value=represent(value)) for name, value in params.items()])
 
-        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)])
-        test_case.labels.append(Label(name=LabelType.HOST, value=self._host))
-        test_case.labels.append(Label(name=LabelType.THREAD, value=self._thread))
-        test_case.labels.append(Label(name=LabelType.FRAMEWORK, value='pytest'))
-        test_case.labels.append(Label(name=LabelType.LANGUAGE, value=platform_label()))
+        self.allure_logger.schedule_test(uuid, test_result)
 
-        test_case.links += [Link(link_type, url, name) for link_type, url, name in allure_links(item)]
+        yield
 
-        test_case.fullName = allure_full_name(item)
-        test_case.historyId = md5(test_case.fullName)
-        test_case.labels.append(Label('package', allure_package(item)))
+        test_result.labels.extend([Label(name=name, value=value) for name, value in allure_labels(item)])
+        test_result.labels.extend([Label(name=LabelType.TAG, value=value) for value in pytest_markers(item)])
+        test_result.labels.append(Label(name=LabelType.HOST, value=self._host))
+        test_result.labels.append(Label(name=LabelType.THREAD, value=self._thread))
+        test_result.labels.append(Label(name=LabelType.FRAMEWORK, value='pytest'))
+        test_result.labels.append(Label(name=LabelType.LANGUAGE, value=platform_label()))
+        test_result.labels.append(Label(name='package', value=allure_package(item)))
+        test_result.links.extend([Link(link_type, url, name) for link_type, url, name in allure_links(item)])
 
         uuid = self._cache.pop(item.nodeid)
         self.allure_logger.close_test(uuid)

allure-pytest/src/utils.py

@@ -84,10 +84,10 @@ def allure_package(item):
     return path.replace('/', '.')
 
 
-def allure_name(item):
+def allure_name(item, parameters):
     name = escape_name(item.name)
     title = allure_title(item)
-    return title if title else name
+    return title.format(**parameters) if title else name
 
 
 def allure_full_name(item):

allure-pytest/test/title/__init__.py renamed to allure-pytest/test/display_name/__init__.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+import pytest
+import allure
+
+
+@allure.title("A some test title")
+def test_display_name():
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_display_name',
+    ...                           has_title("A some test title")
+    ...             )
+    ... )
+    """
+
+
+@allure.title("A some test title with param {param}")
+@pytest.mark.parametrize('param', [False])
+def test_display_name_template(param):
+    """
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_display_name_template[False]',
+    ...                           has_title("A some test title with param False")
+    ...             )
+    ... )
+    """
+    assert param
+
+
+@allure.title(u"Тест с шаблоном и параметром: {param}")
+@pytest.mark.parametrize('param', [False])
+def test_unicode_display_name_template(param):
+    u"""
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_unicode_display_name_template[False]',
+    ...                           has_title(u"Тест с шаблоном и параметром: False")
+    ...             )
+    ... )
+    """
+    assert param
+
+
+@allure.title(u"Лунтик")
+def test_unicode_display_name():
+    u"""
+    >>> allure_report = getfixture('allure_report')
+    >>> assert_that(allure_report,
+    ...             has_test_case('test_unicode_display_name',
+    ...                           has_title(u"Лунтик")
+    ...             )
+    ... )
+    """

allure-pytest/test/display_name/display_name_test.py

@@ -2,11 +2,11 @@
 
 
 @allure.title("A some test tile")
-def test_dynamic_title():
+def test_dynamic_display_name():
     """
     >>> allure_report = getfixture('allure_report')
     >>> assert_that(allure_report,
-    ...             has_test_case('test_dynamic_title',
+    ...             has_test_case('test_dynamic_display_name',
     ...                           has_title("It is renamed test")
     ...             )
     ... )