Add testing for fast grid scan without grid detect

setup.cfg

@@ -36,8 +36,7 @@ install_requires =
     xarray
     doct
     databroker
-    dodal @ git+https://github.com/DiamondLightSource/python-dodal.git@ee7e7b80aab7c43d4027e9001b4935a269553cff
-
+    dodal @ git+https://github.com/DiamondLightSource/python-dodal.git@b49b2dffa27e44eebf42e8c7e35a375da42654cd
 
 [options.extras_require]
 dev =

src/artemis/experiment_plans/tests/test_fast_grid_scan_plan.py

@@ -355,6 +355,8 @@ def test_when_exception_occurs_during_running_then_eiger_disarmed(
     fake_fgs_composite.eiger.filewriters_finished.set_finished()
     fake_fgs_composite.eiger.odin.check_odin_state = MagicMock(return_value=True)
     fake_fgs_composite.eiger.odin.file_writer.num_captured.sim_put(1200)
+    fake_fgs_composite.eiger.filewriters_finished = Status()
+    fake_fgs_composite.eiger.filewriters_finished.set_finished()
 
     fake_fgs_composite.eiger.stage = MagicMock(
         return_value=Status(None, None, 0, True, True)
@@ -372,3 +374,30 @@ def test_when_exception_occurs_during_running_then_eiger_disarmed(
         )
 
     fake_fgs_composite.eiger.disarm_detector.assert_called_once()
+
+
+# Eiger is armed if eiger.armed_status is complete and fan ready is called. This test is very slow - could mocking more functions could speed it up
+def test_fgs_arms_eiger_without_grid_detect(
+    fake_fgs_composite: FGSComposite,
+    test_fgs_params: FGSInternalParameters,
+    mock_subscriptions: FGSCallbackCollection,
+    RE: RunEngine,
+):
+    def get_good_status():
+        status = Status()
+        status.set_finished()
+        return status
+
+    fake_fgs_composite.eiger.odin.check_odin_state = MagicMock(return_value=True)
+    fake_fgs_composite.eiger.odin.check_odin_initialised = MagicMock(
+        return_value=[True, True]
+    )
+    fake_fgs_composite.eiger.set_odin_pvs = MagicMock(return_value=get_good_status())
+    fake_fgs_composite.eiger.stale_params.sim_put(0)
+    fake_fgs_composite.eiger._wait_fan_ready = MagicMock(return_value=get_good_status())
+    fake_fgs_composite.eiger._wait_for_odin_status = MagicMock(
+        return_value=get_good_status()
+    )
+
+    RE(bps.stage(fake_fgs_composite.eiger))
+    fake_fgs_composite.eiger._wait_fan_ready.assert_called_once()

src/artemis/experiment_plans/tests/test_grid_detection_plan.py

@@ -128,7 +128,7 @@ def test_create_devices(create_device: MagicMock):
     create_device.assert_has_calls(
         [
             call(Smargon, "smargon", "-MO-SGON-01:", True, False),
-            call(OAV, "oav", "-DI-OAV-01:", True, False),
+            call(OAV, "oav", "", True, False),
             call(
                 device=Backlight,
                 name="backlight",