Revert "xdist fix"

This reverts commit ab499fa.

Author: ramriddick

pytest_reportportal/listener.py

@@ -2,6 +2,7 @@
 import pytest
 import logging
 
+from .service import PyTestService
 
 try:
     # This try/except can go away once we support pytest >= 3.3
@@ -13,17 +14,16 @@
 
 
 class RPReportListener(object):
-    def __init__(self, py_test_service, log_level=logging.NOTSET):
+    def __init__(self, log_level=logging.NOTSET):
         # Test Item result
-        self.PyTestService = py_test_service
         self.result = None
         self._log_level = log_level
         if PYTEST_HAS_LOGGING_PLUGIN:
             self._log_handler = RPLogHandler(log_level, filter_reportportal_client_logs=True)
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_runtest_protocol(self, item):
-        self.PyTestService.start_pytest_item(item)
+        PyTestService.start_pytest_item(item)
         if PYTEST_HAS_LOGGING_PLUGIN:
             # This check can go away once we support pytest >= 3.3
             with patching_logger_class():
@@ -32,14 +32,14 @@ def pytest_runtest_protocol(self, item):
                     yield
         else:
             yield
-        self.PyTestService.finish_pytest_item(self.result or 'SKIPPED')
+        PyTestService.finish_pytest_item(self.result or 'SKIPPED')
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_runtest_makereport(self):
         report = (yield).get_result()
 
         if report.longrepr:
-            self.PyTestService.post_log(
+            PyTestService.post_log(
                 # Used for support python 2.7
                 cgi.escape(report.longreprtext),
                 loglevel='ERROR',

pytest_reportportal/plugin.py

@@ -2,9 +2,8 @@
 # and/or modify it under the terms of the GPL licence
 
 import logging
-import dill as pickle
-import pytest
-from .service import PyTestServiceClass
+
+from .service import PyTestService
 from .listener import RPReportListener
 
 try:
@@ -15,38 +14,24 @@
     PYTEST_HAS_LOGGING_PLUGIN = False
 
 
-def is_master(config):
-    """
-    True if the code running the given pytest.config object is running in a xdist master
-    node or not running xdist at all.
-    """
-    return not hasattr(config, 'slaveinput')
-
-
-@pytest.mark.optionalhook
-def pytest_configure_node(node):
-    node.slaveinput['py_test_service'] = pickle.dumps(node.config.py_test_service)
-
-
 def pytest_sessionstart(session):
     if session.config.getoption('--collect-only', default=False) is True:
         return
 
-    if is_master(session.config):
-        session.config.py_test_service.init_service(
-            project=session.config.getini('rp_project'),
-            endpoint=session.config.getini('rp_endpoint'),
-            uuid=session.config.getini('rp_uuid'),
-            log_batch_size=int(session.config.getini('rp_log_batch_size')),
-            ignore_errors=bool(session.config.getini('rp_ignore_errors')),
-            ignored_tags=session.config.getini('rp_ignore_tags'),
-        )
+    PyTestService.init_service(
+        project=session.config.getini('rp_project'),
+        endpoint=session.config.getini('rp_endpoint'),
+        uuid=session.config.getini('rp_uuid'),
+        log_batch_size=int(session.config.getini('rp_log_batch_size')),
+        ignore_errors=bool(session.config.getini('rp_ignore_errors')),
+        ignored_tags=session.config.getini('rp_ignore_tags'),
+    )
 
-        session.config.py_test_service.start_launch(
-            session.config.option.rp_launch,
-            tags=session.config.getini('rp_launch_tags'),
-            description=session.config.getini('rp_launch_description'),
-        )
+    PyTestService.start_launch(
+        session.config.option.rp_launch,
+        tags=session.config.getini('rp_launch_tags'),
+        description=session.config.option.rp_launch_description,
+    )
 
 
 def pytest_sessionfinish(session):
@@ -55,8 +40,7 @@ def pytest_sessionfinish(session):
 
     # FixMe: currently method of RP api takes the string parameter
     # so it is hardcoded
-    if is_master(session.config):
-        session.config.py_test_service.finish_launch(status='RP_Launch')
+    PyTestService.finish_launch(status='RP_Launch')
 
 
 def pytest_configure(config):
@@ -65,33 +49,30 @@ def pytest_configure(config):
     if not config.option.rp_launch_description:
         config.option.rp_launch_description = config.getini('rp_launch_description')
 
-    if is_master(config):
-        config.py_test_service = PyTestServiceClass()
-    else:
-        config.py_test_service = pickle.loads(config.slaveinput['py_test_service'])
-        config.py_test_service.RP.listener.start()
+    if config.pluginmanager.hasplugin('xdist'):
+        raise Exception(
+            "pytest report portal is not compatible with 'xdist' plugin.")
 
     # set Pytest_Reporter and configure it
 
     if PYTEST_HAS_LOGGING_PLUGIN:
         # This check can go away once we support pytest >= 3.3
         try:
             config._reporter = RPReportListener(
-                config.py_test_service,
                 _pytest.logging.get_actual_log_level(config, 'rp_log_level')
             )
         except TypeError:
             # No log level set either in INI or CLI
-            config._reporter = RPReportListener(config.py_test_service)
+            config._reporter = RPReportListener()
     else:
-        config._reporter = RPReportListener(config.py_test_service)
+        config._reporter = RPReportListener()
 
     if hasattr(config, '_reporter'):
         config.pluginmanager.register(config._reporter)
 
 
 def pytest_unconfigure(config):
-    config.py_test_service.terminate_service()
+    PyTestService.terminate_service()
 
     if hasattr(config, '_reporter'):
         reporter = config._reporter

pytest_reportportal/rp_logging.py

@@ -4,6 +4,8 @@
 from functools import wraps
 from six import PY2
 
+from .service import PyTestService
+
 
 class RPLogger(logging.getLoggerClass()):
     def __init__(self, name, level=0):
@@ -60,11 +62,10 @@ class RPLogHandler(logging.Handler):
     }
     _sorted_levelnos = sorted(_loglevel_map.keys(), reverse=True)
 
-    def __init__(self, py_test_service, level=logging.NOTSET,
+    def __init__(self, level=logging.NOTSET,
                  filter_reportportal_client_logs=False):
         super(RPLogHandler, self).__init__(level)
         self.filter_reportportal_client_logs = filter_reportportal_client_logs
-        self.py_test_service = py_test_service
 
     def filter(self, record):
         if self.filter_reportportal_client_logs is False:
@@ -89,7 +90,7 @@ def emit(self, record):
             if level <= record.levelno:
                 break
 
-        return self.py_test_service.post_log(
+        return PyTestService.post_log(
             msg,
             loglevel=self._loglevel_map[level],
             attachment=record.__dict__.get('attachment', None),

pytest_reportportal/service.py

@@ -179,3 +179,6 @@ def _get_description(test_item):
         except AttributeError:
             # doctest has no `function` attribute
             return test_item.reportinfo()[2]
+
+
+PyTestService = PyTestServiceClass()

setup.py

@@ -12,10 +12,9 @@ def read_file(fname):
 
 
 requirements = [
-    'reportportal-client>=3.0.1',
+    'reportportal-client>=3.0.0',
     'pytest>=3.0.7',
     'six>=1.10.0',
-    'dill>=0.2.7.1',
 ]