unicode ids (fixes #171 via #172)

Author: sseliverstov

allure-pytest/src/listener.py

@@ -15,7 +15,7 @@
 from allure_commons.model2 import Status
 from allure_commons.types import LabelType
 from allure_pytest.utils import allure_labels, allure_links, pytest_markers
-from allure_pytest.utils import allure_full_name, allure_package
+from allure_pytest.utils import allure_full_name, allure_package, allure_name
 from allure_pytest.utils import get_status, get_status_details
 from allure_pytest.utils import get_outcome_status, get_outcome_status_details
 
@@ -64,7 +64,7 @@ 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=item.name, uuid=uuid)
+        test_case = TestResult(name=allure_name(item), uuid=uuid)
         self.allure_logger.schedule_test(uuid, test_case)
 
         if hasattr(item, 'function'):
@@ -84,9 +84,9 @@ def pytest_runtest_protocol(self, item, nextitem):
 
         test_case.links += [Link(link_type, url, name) for link_type, url, name in allure_links(item)]
 
-        test_case.fullName = allure_full_name(item.nodeid)
+        test_case.fullName = allure_full_name(item)
         test_case.historyId = md5(test_case.fullName)
-        test_case.labels.append(Label('package', allure_package(item.nodeid)))
+        test_case.labels.append(Label('package', allure_package(item)))
 
         uuid = self._cache.pop(item.nodeid)
         self.allure_logger.close_test(uuid)

allure-pytest/src/utils.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 import os
+import six
 import pytest
 from allure_commons.utils import represent
 from allure_commons.utils import format_exception, format_traceback
@@ -56,18 +57,32 @@ def mark_to_str(marker):
         return '@pytest.mark.{name}'.format(name=marker.name)
 
 
-def allure_package(nodeid):
-    parts = nodeid.split('::')
+def allure_package(item):
+    parts = item.nodeid.split('::')
     path = parts[0].split('.')[0]
     return path.replace(os.sep, '.')
 
 
-def allure_full_name(nodeid):
-    parts = nodeid.split('::')
-    package = allure_package(nodeid)
+def allure_name(item):
+    return escape_name(item.name)
+
+
+def allure_full_name(item):
+    parts = item.nodeid.split('::')
+    package = allure_package(item)
     clazz = '.{clazz}'.format(clazz=parts[1]) if len(parts) > 2 else ''
     test = parts[-1]
-    return '{package}{clazz}#{test}'.format(package=package, clazz=clazz, test=test)
+    full_name = '{package}{clazz}#{test}'.format(package=package, clazz=clazz, test=test)
+    return escape_name(full_name)
+
+
+def escape_name(name):
+    if six.PY2:
+        try:
+            name.decode('string_escape').encode('unicode_escape')
+        except UnicodeDecodeError:
+            return name.decode('string_escape').decode('utf-8')
+    return name.encode('utf_8').decode('unicode_escape')
 
 
 def get_outcome_status(outcome):

allure-pytest/test/parametrization/parametrization_unicode_test.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+
+
+@pytest.mark.parametrize('param', [True], ids=['Болек'])
+def test_parametrization_native_ids_encoding(param):
+    """
+    >>> import six
+    >>> allure_report = getfixture('allure_report')
+    >>> param = 'Болек'
+    >>> test_case = 'test_parametrization_native_ids_encoding[{param}]'.format(param=param)
+    >>> if six.PY2:
+    ...     test_case = test_case.decode('utf-8')
+    >>> assert_that(allure_report, has_test_case(test_case))
+    """
+    pass
+
+
+@pytest.mark.parametrize('param', [True], ids=[u'Лёлек'])
+def test_parametrization_utf_ids_encoding(param):
+    """
+    >>> import six
+    >>> allure_report = getfixture('allure_report')
+    >>> if six.PY2:
+    ...     param = 'Лёлек'.decode('utf-8')
+    ...     test_case = u'test_parametrization_utf_ids_encoding[{param}]'.format(param=param)
+    ...     assert_that(allure_report, has_test_case(test_case))
+    ... else:
+    ...     param = 'Лёлек'
+    ...     test_case = 'test_parametrization_utf_ids_encoding[{param}]'.format(param=param)
+    ...     assert_that(allure_report, has_test_case(test_case))
+    """
+    pass

allure-pytest/tox.ini

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