rp_launch_uuid configuration parameter

Author: HardNorth

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- `rp_launch_uuid` configuration parameter, by @HardNorth
+### Changed
+- Client version updated on [5.7.1](https://github.com/reportportal/client-Python/releases/tag/5.7.1), by @HardNorth
 
 ## [5.6.1]
 ### Added

pytest_reportportal/config.py

@@ -44,7 +44,7 @@ class AgentConfig:
     rp_bts_project: str
     rp_bts_url: str
     rp_launch: str
-    rp_launch_id: Optional[str]
+    rp_launch_uuid: Optional[str]
     rp_launch_attributes: Optional[list[str]]
     rp_tests_attributes: Optional[list[str]]
     rp_launch_description: str
@@ -105,7 +105,16 @@ def __init__(self, pytest_config: Config) -> None:
         self.rp_bts_project = self.find_option(pytest_config, "rp_bts_project")
         self.rp_bts_url = self.find_option(pytest_config, "rp_bts_url")
         self.rp_launch = self.find_option(pytest_config, "rp_launch")
-        self.rp_launch_id = self.find_option(pytest_config, "rp_launch_id")
+        self.rp_launch_uuid = self.find_option(pytest_config, "rp_launch_id")
+        if self.rp_launch_uuid:
+            warnings.warn(
+                "Parameter `rp_launch_id` is deprecated since 5.6.2 and will be subject for removing"
+                "in the next major version. Use `rp_launch_uuid` argument instead.",
+                DeprecationWarning,
+                2,
+            )
+            self.rp_launch_uuid = self.find_option(pytest_config, "rp_launch_uuid", self.rp_launch_uuid)
+
         self.rp_launch_attributes = self.find_option(pytest_config, "rp_launch_attributes")
         self.rp_tests_attributes = self.find_option(pytest_config, "rp_tests_attributes")
         self.rp_launch_description = self.find_option(pytest_config, "rp_launch_description")

pytest_reportportal/plugin.py

@@ -531,7 +531,11 @@ def add_shared_option(name, help_str, default=None, action="store"):
     )
     add_shared_option(
         name="rp_launch_id",
-        help_str="Use already existing launch-id. The plugin won't control " "the Launch status",
+        help_str="DEPRECATED: Use already existing launch-id. The plugin won't control the Launch status",
+    )
+    add_shared_option(
+        name="rp_launch_uuid",
+        help_str="Use already existing launch UUID. The plugin won't control the Launch status",
     )
     add_shared_option(
         name="rp_launch_description",

pytest_reportportal/service.py

@@ -74,7 +74,7 @@
 except ImportError:
     Rule = type("dummy", (), {})  # Old pytest-bdd versions do not have Rule
 
-from reportportal_client import RP, create_client
+from reportportal_client import RP, ClientType, create_client, OutputType
 from reportportal_client.helpers import dict_to_payload, gen_attributes, get_launch_sys_attrs, get_package_version
 
 LOGGER = logging.getLogger(__name__)
@@ -1417,10 +1417,10 @@ def start(self) -> None:
             self._config.rp_api_key,
         )
         launch_id = self._launch_id
-        if self._config.rp_launch_id:
-            launch_id = self._config.rp_launch_id
+        if self._config.rp_launch_uuid:
+            launch_id = self._config.rp_launch_uuid
         self.rp = create_client(
-            client_type=self._config.rp_client_type,
+            client_type=self._config.rp_client_type or ClientType.SYNC,
             endpoint=self._config.rp_endpoint,
             project=self._config.rp_project,
             api_key=self._config.rp_api_key,
@@ -1431,7 +1431,7 @@ def start(self) -> None:
             launch_uuid=launch_id,
             log_batch_payload_limit=self._config.rp_log_batch_payload_limit,
             launch_uuid_print=self._config.rp_launch_uuid_print,
-            print_output=self._config.rp_launch_uuid_print_output,
+            print_output=self._config.rp_launch_uuid_print_output or OutputType.STDOUT,
             http_timeout=self._config.rp_http_timeout,
             mode=self._config.rp_mode,
             # OAuth 2.0 parameters

tests/unit/test_plugin.py

@@ -224,7 +224,7 @@ def test_pytest_sessionfinish(mocked_session):
     :param mocked_session: pytest fixture
     """
     mocked_session.config.py_test_service = mock.Mock()
-    mocked_session.config._reporter_config.rp_launch_id = None
+    mocked_session.config._reporter_config.rp_launch_uuid = None
     pytest_sessionfinish(mocked_session)
     assert mocked_session.config.py_test_service.finish_launch.called