Add thread and host labels to pytest (fixes allure-framework#86) (via allure-framework#163)

sseliverstov · web-flow · commit ad5b22488e85 · 2017-10-17T17:51:14.000+03:00
add thread and host labels to pytest
diff --git a/allure-pytest/src/listener.py b/allure-pytest/src/listener.py
@@ -5,6 +5,7 @@
 from allure_commons.utils import uuid4
 from allure_commons.utils import represent
 from allure_commons.utils import platform_label
+from allure_commons.utils import host_tag, thread_tag
 from allure_commons.reporter import AllureReporter
 from allure_commons.model2 import TestStepResult, TestResult, TestBeforeResult, TestAfterResult
 from allure_commons.model2 import TestResultContainer
@@ -24,6 +25,8 @@ class AllureListener(object):
     def __init__(self):
         self.allure_logger = AllureReporter()
         self._cache = ItemCache()
+        self._host = host_tag()
+        self._thread = thread_tag()
 
     @allure_commons.hookimpl
     def start_step(self, uuid, title, params):
@@ -74,6 +77,8 @@ def pytest_runtest_protocol(self, item, nextitem):
 
         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()))
 
diff --git a/allure-pytest/test/conftest.py b/allure-pytest/test/conftest.py
@@ -4,6 +4,7 @@
 import shlex
 from inspect import getmembers, isfunction
 from allure_commons_test.report import AllureReport
+from allure_commons.utils import thread_tag
 
 
 @pytest.fixture(scope='function', autouse=True)
@@ -31,7 +32,7 @@ def allure_report_with_params(request, tmpdir_factory):
     tmpdir = tmpdir_factory.mktemp('data')
 
     def run_with_params(*params):
-        key = '{module}{param}'.format(module=module, param=''.join(params))
+        key = '{thread}{module}{param}'.format(thread=thread_tag(), module=module, param=''.join(params))
         if not request.config.cache.get(key, False):
             _runner(tmpdir.strpath, module, *params)
             request.config.cache.set(key, True)
diff --git a/allure-pytest/tox.ini b/allure-pytest/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist=
     py{27,33,34,35}
+    xdist
     static_check
 
 
@@ -21,6 +22,24 @@ commands=
     py.test --doctest-module --alluredir={envtmpdir} {posargs: ./test/}
 
 
+[testenv:xdist]
+passenv =
+    HOME
+
+whitelist_externals = rm
+
+deps=
+    pyhamcrest
+    pytest-xdist
+    {distshare}/allure-python-commons-2*.zip
+    {distshare}/allure-python-commons-test-2*.zip
+
+commands=
+    python setup.py develop
+    rm -f {envtmpdir}/*.json
+    py.test -n 4 --doctest-module --alluredir={envtmpdir} {posargs: ./test/}
+
+
 # Run tests without result checking. It is useful for:
 # 1. Getting demo report: `tox -e demo`
 # 2. Executing separate test:
diff --git a/allure-python-commons/src/utils.py b/allure-python-commons/src/utils.py
@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
 
+import os
 import sys
 import six
 import time
 import uuid
+import socket
 import inspect
 import hashlib
 import platform
+import threading
 import traceback
 
 if sys.version_info.major > 2:
@@ -38,6 +41,14 @@ def platform_label():
                                                     major_version=major_version)
 
 
+def thread_tag():
+    return '{0}-{1}'.format(os.getpid(), threading.current_thread().name)
+
+
+def host_tag():
+    return socket.gethostname()
+
+
 def represent(item):
     """
     >>> represent(None)
