Move Launch UUID print on client side

Author: HardNorth

pytest_reportportal/plugin.py

@@ -104,9 +104,6 @@ def pytest_sessionstart(session):
 
     if is_control(config) and not config._reporter_config.rp_launch_id:
         config.py_test_service.start_launch()
-        if config._reporter_config.rp_launch_uuid_print:
-            launch_id = config.py_test_service.rp.launch_id
-            print(f'Report Portal Launch UUID: {launch_id}', file=config._reporter_config.rp_launch_uuid_print_output)
         if config.pluginmanager.hasplugin('xdist') \
                 or config.pluginmanager.hasplugin('pytest-parallel'):
             if not wait_launch(session.config.py_test_service.rp):

pytest_reportportal/service.py

@@ -890,7 +890,9 @@ def start(self) -> None:
             retries=self._config.rp_api_retries,
             verify_ssl=self._config.rp_verify_ssl,
             launch_id=launch_id,
-            log_batch_payload_size=self._config.rp_log_batch_payload_size
+            log_batch_payload_size=self._config.rp_log_batch_payload_size,
+            launch_uuid_print=self._config.rp_launch_uuid_print,
+            print_output=self._config.rp_launch_uuid_print_output
         )
         if hasattr(self.rp, "get_project_settings"):
             self.project_settings = self.rp.get_project_settings()

requirements.txt

@@ -1,5 +1,5 @@
 dill>=0.3.6
 pytest>=3.8.0
-reportportal-client==5.3.5
+reportportal-client==5.4.0
 aenum>=3.1.0
 requests>=2.27.1

tests/integration/test_config_handling.py

@@ -304,8 +304,8 @@ def test_launch_uuid_print(mock_client_init):
 
     assert int(result) == 0, 'Exit code should be 0 (no errors)'
     expect(mock_client_init.call_count == 1)
-
-    expect('Report Portal Launch UUID:' in str_io.getvalue())
+    expect(mock_client_init.call_args_list[0].kwargs['launch_uuid_print'] == print_uuid)
+    expect(mock_client_init.call_args_list[0].kwargs['print_output'] is str_io)
     assert_expectations()
 
 
@@ -326,8 +326,8 @@ def test_launch_uuid_print_stderr(mock_client_init):
 
     assert int(result) == 0, 'Exit code should be 0 (no errors)'
     expect(mock_client_init.call_count == 1)
-
-    expect('Report Portal Launch UUID:' in str_io.getvalue())
+    expect(mock_client_init.call_args_list[0].kwargs['launch_uuid_print'] == print_uuid)
+    expect(mock_client_init.call_args_list[0].kwargs['print_output'] is str_io)
     assert_expectations()
 
 
@@ -348,8 +348,8 @@ def test_launch_uuid_print_invalid_output(mock_client_init):
 
     assert int(result) == 0, 'Exit code should be 0 (no errors)'
     expect(mock_client_init.call_count == 1)
-
-    expect('Report Portal Launch UUID:' in str_io.getvalue())
+    expect(mock_client_init.call_args_list[0].kwargs['launch_uuid_print'] == print_uuid)
+    expect(mock_client_init.call_args_list[0].kwargs['print_output'] is str_io)
     assert_expectations()