diff --git a/pyproject.toml b/pyproject.toml index 5a10a8eaf..fae4d9596 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ dependencies = [ "ophyd == 1.9.0", "ophyd-async >= 0.3a5", "bluesky >= 1.13.0a4", - "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@db42ad951155ba2cfd7574d3b5452c9bf975bfcf", + "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@main", ] 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 index ff6cded40..167f3930d 100644 --- a/tests/unit_tests/hyperion/experiment_plans/test_rotation_scan_plan.py +++ b/tests/unit_tests/hyperion/experiment_plans/test_rotation_scan_plan.py @@ -233,14 +233,12 @@ async def test_full_rotation_plan_smargon_settings( async def test_rotation_plan_moves_aperture_correctly( run_full_rotation_plan: RotationScanComposite, - test_rotation_params: RotationScan, ) -> None: aperture_scatterguard: ApertureScatterguard = ( run_full_rotation_plan.aperture_scatterguard ) assert ( - await aperture_scatterguard.get_current_aperture_position() - == ApertureValue.SMALL + await aperture_scatterguard.selected_aperture.get_value() == ApertureValue.SMALL )