Fix tests

Author: HardNorth

pytest_reportportal/plugin.py

@@ -47,6 +47,10 @@
 
 LOGGER: Logger = logging.getLogger(__name__)
 
+MANDATORY_PARAMETER_MISSED_PATTERN: str = (
+    "One of the following mandatory parameters is unset: " + "rp_project: {}, rp_endpoint: {}"
+)
+
 FAILED_LAUNCH_WAIT: str = (
     "Failed to initialize reportportal-client service. "
     + "Waiting for Launch start timed out. "
@@ -194,6 +198,13 @@ def pytest_configure(config) -> None:
         LOGGER.debug("Disabling reporting to RP.")
         return
 
+    cond = (agent_config.rp_project, agent_config.rp_endpoint)
+    config._rp_enabled = all(cond)
+    if not config._rp_enabled:
+        LOGGER.debug(MANDATORY_PARAMETER_MISSED_PATTERN.format(*cond))
+        LOGGER.debug("Disabling reporting to RP.")
+        return
+
     config._reporter_config = agent_config
 
     if is_control(config):

tests/unit/test_plugin.py

@@ -134,13 +134,7 @@ def test_pytest_configure_misssing_rp_endpoint(mocked_log, mocked_config):
     assert mocked_config._rp_enabled is False
     mocked_log.debug.assert_has_calls(
         [
-            mock.call(
-                MANDATORY_PARAMETER_MISSED_PATTERN.format(
-                    mocked_config.option.rp_project,
-                    None,
-                    mocked_config.option.rp_api_key,
-                )
-            ),
+            mock.call(MANDATORY_PARAMETER_MISSED_PATTERN.format(mocked_config.option.rp_project, None)),
             mock.call("Disabling reporting to RP."),
         ]
     )
@@ -164,13 +158,7 @@ def test_pytest_configure_misssing_rp_project(mocked_log, mocked_config):
     assert mocked_config._rp_enabled is False
     mocked_log.debug.assert_has_calls(
         [
-            mock.call(
-                MANDATORY_PARAMETER_MISSED_PATTERN.format(
-                    None,
-                    mocked_config.option.rp_endpoint,
-                    mocked_config.option.rp_api_key,
-                )
-            ),
+            mock.call(MANDATORY_PARAMETER_MISSED_PATTERN.format(None, mocked_config.option.rp_endpoint)),
             mock.call("Disabling reporting to RP."),
         ]
     )
@@ -196,9 +184,7 @@ def test_pytest_configure_misssing_rp_uuid(mocked_log, mocked_config):
         [
             mock.call(
                 MANDATORY_PARAMETER_MISSED_PATTERN.format(
-                    mocked_config.option.rp_project,
-                    mocked_config.option.rp_endpoint,
-                    None,
+                    mocked_config.option.rp_project, mocked_config.option.rp_endpoint
                 )
             ),
             mock.call("Disabling reporting to RP."),