From 92f25e9692b269116fb62acfd3e179a5b6c1be06 Mon Sep 17 00:00:00 2001 From: Jacob Williamson Date: Mon, 8 Dec 2025 11:38:07 +0000 Subject: [PATCH 1/2] Fix system tests --- .../external_interaction/test_ispyb_dev_connection.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system_tests/hyperion/external_interaction/test_ispyb_dev_connection.py b/tests/system_tests/hyperion/external_interaction/test_ispyb_dev_connection.py index ef33902031..af7afa81b0 100644 --- a/tests/system_tests/hyperion/external_interaction/test_ispyb_dev_connection.py +++ b/tests/system_tests/hyperion/external_interaction/test_ispyb_dev_connection.py @@ -480,8 +480,8 @@ def test_ispyb_deposition_in_gridscan( "orientation": "horizontal", "snaked": True, "dataCollectionId": ispyb_ids.data_collection_ids[0], - "micronsPerPixelX": 0.8060031111720091, - "micronsPerPixelY": 0.8060031111720091, + "micronsPerPixelX": 0.806, + "micronsPerPixelY": 0.806, } compare_actual_and_expected( From 4b61f53aa3cfb2ba7e68fad09fd69b0591c4d70f Mon Sep 17 00:00:00 2001 From: Jacob Williamson Date: Mon, 8 Dec 2025 13:58:55 +0000 Subject: [PATCH 2/2] Ensure DCM and undulator in undulator_dcm fixture are singletons --- tests/conftest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 66eea68538..b87822cc8d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -684,11 +684,13 @@ def mirror_voltages(): @pytest.fixture -def undulator_dcm(sim_run_engine): +def undulator_dcm(sim_run_engine, dcm, undulator): undulator_dcm = i03.undulator_dcm.build( connect_immediately=True, mock=True, daq_configuration_path="tests/test_data/test_daq_configuration", + dcm=dcm, + undulator=undulator, ) set_up_dcm(undulator_dcm.dcm_ref(), sim_run_engine) yield undulator_dcm