Merge pull request #338 from reportportal/develop

Release

Author: HardNorth

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 ### Fixed
+- `rp_thread_logging = False` config parameter handling, by @HardNorth
+- Recursive thread init issue in case of `rp_thread_logging = True`, by @HardNorth
+### Changed
+- Client version updated on [5.3.2](https://github.com/reportportal/client-Python/releases/tag/5.3.2), by @HardNorth
+
+## [5.1.7]
+### Fixed
 - Plugin Exception in case of Launch creation timed out, by @HardNorth
 ### Changed
 - Client version updated on [5.3.1](https://github.com/reportportal/client-Python/releases/tag/5.3.1), by @HardNorth

pytest_reportportal/config.py

@@ -59,10 +59,10 @@ def __init__(self, pytest_config):
             self.rp_log_batch_payload_size = MAX_LOG_BATCH_PAYLOAD_SIZE
         self.rp_log_level = get_actual_log_level(pytest_config, 'rp_log_level')
         self.rp_log_format = self.find_option(pytest_config, 'rp_log_format')
-        self.rp_mode = self.find_option(pytest_config, 'rp_mode')
-        self.rp_thread_logging = self.find_option(
+        self.rp_thread_logging = bool(strtobool(str(self.find_option(
             pytest_config, 'rp_thread_logging'
-        )
+        ) or False)))
+        self.rp_mode = self.find_option(pytest_config, 'rp_mode')
         self.rp_parent_item_id = self.find_option(pytest_config,
                                                   'rp_parent_item_id')
         self.rp_project = self.find_option(pytest_config,

pytest_reportportal/plugin.py

@@ -43,7 +43,7 @@
                      + 'Reporting is disabled.'
 
 
-@pytest.mark.optionalhook
+@pytest.hookimpl(optionalhook=True)
 def pytest_configure_node(node):
     """Configure xdist node controller.
 

pytest_reportportal/rp_logging.py

@@ -5,10 +5,21 @@
 from contextlib import contextmanager
 from functools import wraps
 
-from reportportal_client.client import RPClient
-
 from reportportal_client._local import current, set_current
 from reportportal_client import RPLogger
+from reportportal_client.core.worker import APIWorker
+
+
+def is_api_worker(target):
+    """Check if target is an RP worker thread."""
+    if target:
+        method_name = getattr(target, '__name__', None)
+        method_self = getattr(target, '__self__', None)
+        if method_name == '_monitor' and method_self:
+            clazz = getattr(method_self, '__class__', None)
+            if clazz is APIWorker:
+                return True
+    return False
 
 
 @contextmanager
@@ -30,7 +41,8 @@ def wrap_start(original_func):
                 def _start(self, *args, **kwargs):
                     """Save the invoking thread's client if there is one."""
                     # Prevent an endless loop of workers being spawned
-                    if "_monitor" not in self.name:
+                    target = getattr(self, '_target', None)
+                    if not is_api_worker(self) and not is_api_worker(target):
                         current_client = current()
                         self.parent_rp_client = current_client
                     return original_func(self, *args, **kwargs)
@@ -48,20 +60,7 @@ def _run(self, *args, **kwargs):
                         and not current()
                     ):
                         parent = self.parent_rp_client
-                        client = RPClient(
-                            endpoint=parent.endpoint,
-                            project=parent.project,
-                            token=parent.token,
-                            log_batch_size=parent.log_batch_size,
-                            is_skipped_an_issue=parent.is_skipped_an_issue,
-                            verify_ssl=parent.verify_ssl,
-                            retries=config.rp_retries,
-                            launch_id=parent.launch_id
-                        )
-                        if parent.current_item():
-                            client._item_stack.append(
-                                parent.current_item()
-                            )
+                        client = parent.clone()
                         client.start()
                     try:
                         return original_func(self, *args, **kwargs)

requirements.txt

@@ -1,6 +1,6 @@
 dill>=0.2.7.1
 pytest>=3.8.0
-reportportal-client==5.3.1
-six>=1.15.0
+reportportal-client==5.3.4
+six>=1.16.0
 aenum>=3.1.0
-requests
+requests>=2.27.1

setup.py

@@ -5,7 +5,7 @@
 from setuptools import setup
 
 
-__version__ = '5.1.7'
+__version__ = '5.1.8'
 
 
 def read_file(fname):

tests/integration/test_threads_logs.py

@@ -4,21 +4,21 @@
 from tests.helpers import utils
 
 
-@mock.patch('pytest_reportportal.rp_logging.RPClient')
 @mock.patch(REPORT_PORTAL_SERVICE)
-def test_rp_thread_logs_reporting(mock_client_init, mock_thread_client_init):
+def test_rp_thread_logs_reporting(mock_client_init):
     """Verify logs from threads are sent to correct items`.
 
     :param mock_client_init: Pytest fixture
     """
     mock_client = mock_client_init.return_value
-    mock_thread_client = mock_thread_client_init.return_value
+    mock_thread_client = mock_client.clone()
 
     def init_thread_client(*_, **__):
         from reportportal_client._local import set_current
         set_current(mock_thread_client)
         return mock_thread_client
-    mock_thread_client_init.side_effect = init_thread_client
+
+    mock_client.clone.side_effect = init_thread_client
     result = utils.run_tests_with_client(
         mock_client,
         ['examples/threads/'],

tests/unit/conftest.py

@@ -66,6 +66,7 @@ def getoption_side_effect(name, default=None):
     mocked_config.option.rp_hierarchy_dirs_level = '0'
     mocked_config.option.rp_rerun = False
     mocked_config.option.rp_launch_timeout = -1
+    mocked_config.option.rp_thread_logging = True
     return mocked_config