fix: pytests

Author: jgaucher-cs

services/staging/rs_server_staging/processors.py

@@ -14,7 +14,6 @@
 """RSPY Staging processor."""
 
 import asyncio  # for handling asynchronous tasks
-import json
 import os
 import time
 import uuid
@@ -705,7 +704,7 @@ def dask_cluster_connect(self) -> Client:  # pylint: disable=too-many-branches,t
 
                 # Sort the clusters by newest first
                 clusters = sorted(gateway.list_clusters(), key=lambda cluster: cluster.start_time, reverse=True)
-                self.logger.debug(f"Cluster list for gateway {os.environ['DASK_GATEWAY__ADDRESS']!r}:{clusters}")
+                self.logger.debug(f"Cluster list for gateway {os.environ['DASK_GATEWAY__ADDRESS']!r}: {clusters}")
 
                 # In local mode, get the first cluster from the gateway.
                 cluster_id = None

services/staging/tests/test_rspy_processor.py

@@ -715,6 +715,8 @@ def test_dask_cluster_connect(self, mocker, staging_instance: Staging, cluster_o
                 "RSPY_DASK_STAGING_CLUSTER_NAME": cluster_options["cluster_name"],
             },
         )
+        # Mock the cluster mode
+        mocker.patch("rs_server_staging.processors.LOCAL_MODE", new=False, autospec=False)
         # Mock the logger
         mock_logger = mocker.patch.object(staging_instance, "logger")
         staging_instance.cluster = None
@@ -749,7 +751,9 @@ def test_dask_cluster_connect(self, mocker, staging_instance: Staging, cluster_o
         mock_client.assert_called_once_with(staging_instance.cluster)
 
         # Ensure logging was called as expected
-        mock_logger.debug.assert_any_call(f"The list of clusters: {mock_list_clusters.return_value}")
+        mock_logger.debug.assert_any_call(
+            f"Cluster list for gateway 'gateway-address': {mock_list_clusters.return_value}",
+        )
         mock_logger.info.assert_any_call("Number of running workers: 2")
         mock_logger.debug.assert_any_call(
             f"Dask Client: {client} | Cluster dashboard: {mock_connect.return_value.dashboard_link}",
@@ -768,6 +772,8 @@ def test_dask_cluster_connect_failure_no_cluster_name(self, mocker, staging_inst
                 "RSPY_DASK_STAGING_CLUSTER_NAME": non_existent_cluster,
             },
         )
+        # Mock the cluster mode
+        mocker.patch("rs_server_staging.processors.LOCAL_MODE", new=False, autospec=False)
         # Mock the logger
         mock_logger = mocker.patch.object(staging_instance, "logger")
         staging_instance.cluster = None
@@ -791,7 +797,8 @@ def test_dask_cluster_connect_failure_no_cluster_name(self, mocker, staging_inst
             staging_instance.dask_cluster_connect()
         # Ensure logging was called as expected
         mock_logger.exception.assert_any_call(
-            "Failed to find the specified dask cluster: " f"No dask cluster named '{non_existent_cluster}' was found.",
+            "Failed to find the specified dask cluster: "
+            f"Dask cluster with 'cluster_name'={non_existent_cluster!r} was not found.",
         )
 
     def test_dask_cluster_connect_failure_no_envs(self, mocker, staging_instance: Staging):

services/staging/tests/test_staging.py

@@ -526,12 +526,7 @@ async def test_app_lifespan_gateway_error(
     """Test app_lifespan when there is an error in connecting to the Dask Gateway."""
 
     # Mock environment variables to simulate gateway mode
-    mocker.patch.dict(
-        os.environ,
-        {
-            "RSPY_LOCAL_MODE": "0",
-        },
-    )
+    mocker.patch("rs_server_staging.main.LOCAL_MODE", new=False, autospec=False)
 
     # Mock FastAPI app
     mock_app = FastAPI()