Add support for step in threading

Author: Glazov Nikolay

allure-pytest/src/listener.py

@@ -22,6 +22,7 @@
 from allure_pytest.utils import get_outcome_status, get_outcome_status_details
 from allure_pytest.utils import get_pytest_report_status
 from allure_commons.utils import md5
+import threading
 
 
 class AllureListener(object):
@@ -36,8 +37,13 @@ def __init__(self, config):
     @allure_commons.hookimpl
     def start_step(self, uuid, title, params):
         parameters = [Parameter(name=name, value=value) for name, value in params.items()]
-        step = TestStepResult(name=title, start=now(), parameters=parameters)
-        self.allure_logger.start_step(None, uuid, step)
+        step = TestStepResult(name=title, start=now(), parameters=parameters, thrd=threading.current_thread().name)
+        if thread_tag() != self._thread:
+            self.allure_logger.start_step(self.allure_logger.last_with_thread(), uuid, step)
+        else:
+            self.allure_logger.start_step(None, uuid, step)
+        # step = TestStepResult(name=title, start=now(), parameters=parameters)
+        # self.allure_logger.start_step(None, uuid, step)
 
     @allure_commons.hookimpl
     def stop_step(self, uuid, exc_type, exc_val, exc_tb):
@@ -241,6 +247,12 @@ def add_description_html(self, test_description_html):
         if test_result:
             test_result.descriptionHtml = test_description_html
 
+    @allure_commons.hookimpl
+    def add_thrd(self, test_description_html):
+        test_result = self.allure_logger.get_test(None)
+        if test_result:
+            test_result.descriptionHtml = test_description_html
+
     @allure_commons.hookimpl
     def add_link(self, url, link_type, name):
         test_result = self.allure_logger.get_test(None)

allure-python-commons/src/_core.py

@@ -1,11 +1,13 @@
 import threading
+import multiprocessing
 from six import with_metaclass
 from pluggy import PluginManager
 from allure_commons import _hooks
 
 
 class MetaPluginManager(type):
     _storage = threading.local()
+    _storage = multiprocessing.Process
 
     @staticmethod
     def get_plugin_manager():

allure-python-commons/src/logger.py

@@ -12,6 +12,14 @@
 INDENT = 4
 
 
+def delete_step_thrd(data):
+    if "steps" in data.keys():
+        for step in data['steps']:
+            step.pop("thrd", None)
+            step = delete_step_thrd(step)
+    return data
+
+
 class AllureFileLogger(object):
 
     def __init__(self, report_dir, clean=False):
@@ -32,6 +40,8 @@ def _report_item(self, item):
         indent = INDENT if os.environ.get("ALLURE_INDENT_OUTPUT") else None
         filename = item.file_pattern.format(prefix=uuid.uuid4())
         data = asdict(item, filter=lambda attr, value: not (type(value) != bool and not bool(value)))
+        data = delete_step_thrd(data)
+
         with io.open(os.path.join(self._report_dir, filename), 'w', encoding='utf8') as json_file:
             if sys.version_info.major < 3:
                 json_file.write(

allure-python-commons/src/model2.py

@@ -1,5 +1,6 @@
 from attr import attrs, attrib
 from attr import Factory
+import threading
 
 
 TEST_GROUP_PATTERN = "{prefix}-container.json"
@@ -37,6 +38,7 @@ class ExecutableItem(object):
     parameters = attrib(default=Factory(list))
     start = attrib(default=None)
     stop = attrib(default=None)
+    thrd = attrib(default=None)
 
 
 @attrs

allure-python-commons/src/reporter.py

@@ -1,4 +1,6 @@
 from collections import OrderedDict
+import os
+import shutil
 
 from allure_commons.types import AttachmentType
 from allure_commons.model2 import ExecutableItem
@@ -27,6 +29,13 @@ def _last_executable(self):
             if isinstance(self._items[_uuid], ExecutableItem):
                 return _uuid
 
+    def last_with_thread(self):
+        for _uuid in reversed(self._items):
+            if self._items[_uuid].thrd != "MainThread":
+                continue
+            if isinstance(self._items[_uuid], ExecutableItem):
+                return _uuid
+
     def get_item(self, uuid):
         return self._items.get(uuid)
 
@@ -111,6 +120,8 @@ def _attach(self, uuid, name=None, attachment_type=None, extension=None):
     def attach_file(self, uuid, source, name=None, attachment_type=None, extension=None):
         file_name = self._attach(uuid, name=name, attachment_type=attachment_type, extension=extension)
         plugin_manager.hook.report_attached_file(source=source, file_name=file_name)
+        destination = os.path.join('./allure-results', file_name)
+        shutil.copy2(source, destination)
 
     def attach_data(self, uuid, body, name=None, attachment_type=None, extension=None):
         file_name = self._attach(uuid, name=name, attachment_type=attachment_type, extension=extension)