(#1242) Fix tests

DiamondLightSource · Mar 8, 2024 · 7ad7b8f · 7ad7b8f
1 parent aedcbf8
commit 7ad7b8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tests/unit_tests/experiment_plans/test_flyscan_xray_centre_plan.py b/tests/unit_tests/experiment_plans/test_flyscan_xray_centre_plan.py
@@ -242,7 +242,8 @@ def test_read_hardware_for_ispyb_updates_from_ophyd_devices(
  assert hyperion_params.ispyb_params.sample_barcode == "BARCODE"
 
  @patch(
- "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range"
+ "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range",
+ return_value=Status(done=True, success=True),
  )
  @patch(
  "hyperion.experiment_plans.flyscan_xray_centre_plan.run_gridscan", autospec=True
@@ -348,6 +349,7 @@ def test_results_passed_to_move_motors(
 
  @patch(
  "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range",
+ return_value=Status(done=True, success=True),
  )
  @patch(
  "hyperion.experiment_plans.flyscan_xray_centre_plan.run_gridscan", autospec=True

diff --git a/tests/unit_tests/experiment_plans/test_panda_flyscan_xray_centre_plan.py b/tests/unit_tests/experiment_plans/test_panda_flyscan_xray_centre_plan.py
@@ -198,7 +198,8 @@ def test_read_hardware_for_ispyb_updates_from_ophyd_devices(
  assert params.hyperion_params.ispyb_params.sample_barcode == "BARCODE"
 
  @patch(
- "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range"
+ "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range",
+ return_value=Status(done=True, success=True),
  )
  @patch(
  "hyperion.experiment_plans.panda_flyscan_xray_centre_plan.run_gridscan",
@@ -318,6 +319,7 @@ def test_results_passed_to_move_motors(
 
  @patch(
  "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range",
+ return_value=Status(done=True, success=True),
  )
  @patch(
  "hyperion.experiment_plans.panda_flyscan_xray_centre_plan.run_gridscan",