Mock both the return value and the context-managed return value of 'ISPyBSession'

Author: tieneupin

tests/workflows/clem/test_register_preprocessing_results.py

@@ -189,28 +189,28 @@ def test_run_with_db(
     mock_get_security_config.return_value = mock_security_config
 
     mock_ispyb_session_factory = MagicMock(return_value=ispyb_db_session)
-    mock_ispyb_session_factory.__enter__.return_value = ispyb_db_session
+    mock_ispyb_session_factory.return_value = ispyb_db_session
+    mock_ispyb_session_factory.return_value.__enter__.return_value = ispyb_db_session
     # mock_ispyb_sessionmaker = mocker.patch(
     mocker.patch(
         "murfey.server.ispyb.sessionmaker", return_value=mock_ispyb_session_factory
     )
+    # mocker.patch(
+    #     "murfey.server.ispyb.ISPyBSession",
+    #     return_value=ispyb_db_session,
+    # )
 
     # Mock the ISPYB connection when registering data collection group
     mocker.patch(
         "murfey.workflows.register_data_collection_group.ISPyBSession",
         return_value=ispyb_db_session,
     )
-    mocker.patch(
-        "murfey.server.ispyb.ISPyBSession",
-        return_value=ispyb_db_session,
-    )
 
     # Mock out the machine config used in the helper sanitisation function
     mock_get_machine_config = mocker.patch("murfey.workflows.clem.get_machine_config")
     mock_machine_config = MagicMock()
     mock_machine_config.rsync_basepath = rsync_basepath
     mock_get_machine_config.return_value = {
-        # "": mock_machine_config,
         ExampleVisit.instrument_name: mock_machine_config,
     }