Try fixing tests

Author: stephen-riggs

tests/server/test_ispyb.py

@@ -73,12 +73,27 @@ def test_get_all_ongoing_visits():
 
 @mock.patch("workflows.transport.pika_transport.PikaTransport")
 def test_update_data_collection_group(mock_transport, ispyb_db_session: Session):
+    # Manually get the BLSession ID for comparison
+    bl_session_id = (
+        ispyb_db_session.execute(
+            select(BLSession)
+            .join(Proposal)
+            .where(BLSession.proposalId == Proposal.proposalId)
+            .where(BLSession.beamLineName == ExampleVisit.instrument_name)
+            .where(Proposal.proposalCode == ExampleVisit.proposal_code)
+            .where(Proposal.proposalNumber == str(ExampleVisit.proposal_number))
+            .where(BLSession.visit_number == ExampleVisit.visit_number)
+        )
+        .scalar_one()
+        .sessionId
+    )
+    # Insert data collection group
     get_or_create_db_entry(
         session=ispyb_db_session,
         table=DataCollectionGroup,
         insert_kwargs={
             "dataCollectionGroupId": 1,
-            "sessionId": 0,
+            "sessionId": bl_session_id,
             "experimentTypeId": 1,
         },
     )

tests/workflows/tomo/test_tomo_metadata.py

@@ -137,14 +137,14 @@ def test_register_search_map_update_with_all_parameters(
     # Check this would have updated ispyb
     update_args = mock_transport.do_update_search_map.call_args_list
     assert len(update_args) == 2
-    assert update_args[0][0] == 1
-    assert update_args[1][0] == 1
-    assert update_args[0][1].x_location == new_parameters.x_location
-    assert update_args[0][1].y_location == new_parameters.y_location
-    assert update_args[1][1].x_location == sm_final_parameters.x_location
-    assert update_args[1][1].x_location == sm_final_parameters.y_location
-    assert update_args[1][1].height_on_atlas == int(40 * 7.8)
-    assert update_args[1][1].width_on_atlas == int(20 * 7.8)
+    assert update_args[0][0][0] == 1
+    assert update_args[0][1][0] == 1
+    assert update_args[0][0][1].x_stage_position == 0.3
+    assert update_args[0][0][1].y_stage_position == 0.4
+    assert update_args[0][1][1].x_location == sm_final_parameters.x_location
+    assert update_args[0][1][1].x_location == sm_final_parameters.y_location
+    assert update_args[0][1][1].height_on_atlas == int(40 * 7.8)
+    assert update_args[0][1][1].width_on_atlas == int(20 * 7.8)
 
 
 @mock.patch("murfey.workflows.tomo.tomo_metadata._transport_object")