Fixes to changes after rebasing

DiamondLightSource · Jan 9, 2025 · db33f04 · db33f04
1 parent 99f1ad2
commit db33f04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/unit_tests/hyperion/experiment_plans/test_multi_rotation_scan_plan.py b/tests/unit_tests/hyperion/experiment_plans/test_multi_rotation_scan_plan.py
@@ -18,6 +18,7 @@
 from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.common.external_interaction.ispyb.ispyb_store import StoreInIspyb
+from mx_bluesky.common.external_interaction.nexus.nexus_utils import AxisDirection
 from mx_bluesky.hyperion.experiment_plans.rotation_scan_plan import (
     RotationScanComposite,
     calculate_motion_profile,
@@ -29,7 +30,6 @@
 from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback import (
     RotationNexusFileCallback,
 )
-from mx_bluesky.hyperion.external_interaction.nexus.nexus_utils import AxisDirection
 from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.parameters.rotation import MultiRotationScan, RotationScan
 

diff --git a/tests/unit_tests/hyperion/experiment_plans/test_rotation_scan_plan.py b/tests/unit_tests/hyperion/experiment_plans/test_rotation_scan_plan.py
@@ -743,7 +743,7 @@ def test_rotation_scan_fails_with_exception_when_no_beamstop(
     ],
 )
 @patch(
-    "mx_bluesky.hyperion.external_interaction.callbacks.zocalo_callback.ZocaloTrigger",
+    "mx_bluesky.common.external_interaction.callbacks.common.zocalo_callback.ZocaloTrigger",
     MagicMock(),
 )
 @patch(
@@ -808,7 +808,7 @@ def test_rotation_scan_plan_with_omega_flip_inverts_motor_movements_but_not_even
         )
     )
     event_params = RotationScan.model_validate_json(
-        rotation_outer_start_event.args[1]["hyperion_parameters"]
+        rotation_outer_start_event.args[1]["mx_bluesky_parameters"]
     )
     # event params are not transformed
     assert event_params.omega_start_deg == 30