(#499) Use test OAV config files again

DiamondLightSource · Aug 9, 2023 · c78ba4b · c78ba4b
1 parent 545709c
commit c78ba4b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/artemis/experiment_plans/pin_centre_then_xray_centre_plan.py b/src/artemis/experiment_plans/pin_centre_then_xray_centre_plan.py
@@ -46,10 +46,10 @@ def create_parameters_for_grid_detection(
 
 def pin_centre_then_xray_centre_plan(
     parameters: PinCentreThenXrayCentreInternalParameters,
+    oav_config_files=OAV_CONFIG_FILE_DEFAULTS,
 ):
     """Plan that perfoms a pin tip centre followed by an xray centre to completely
     centre the sample"""
-    oav_config_files = OAV_CONFIG_FILE_DEFAULTS
     oav_config_files["oav_config_json"] = parameters.experiment_params.oav_centring_file
 
     yield from pin_tip_centre_plan(

diff --git a/src/artemis/experiment_plans/tests/test_pin_centre_then_xray_centre_plan.py b/src/artemis/experiment_plans/tests/test_pin_centre_then_xray_centre_plan.py
@@ -54,9 +54,14 @@ def test_when_pin_centre_xray_centre_called_then_plan_runs_correctly(
     mock_detect_and_do_gridscan: MagicMock,
     mock_pin_tip_centre: MagicMock,
     test_pin_centre_then_xray_centre_params: PinCentreThenXrayCentreInternalParameters,
+    test_config_files,
 ):
     RE = RunEngine()
-    RE(pin_centre_then_xray_centre_plan(test_pin_centre_then_xray_centre_params))
+    RE(
+        pin_centre_then_xray_centre_plan(
+            test_pin_centre_then_xray_centre_params, test_config_files
+        )
+    )
 
     mock_detect_and_do_gridscan.assert_called_once()
     mock_pin_tip_centre.assert_called_once()