Make stage synchronous if arming not started

src/dodal/devices/eiger.py

@@ -85,14 +85,19 @@ def async_stage(self):
         self.arming_status = self.do_arming_chain()
         return self.arming_status
 
+    def is_armed(self):
+        if self.odin.fan.ready.get() == 1 and self.cam.acquire.get() == 1:
+            return True
+        else:
+            return False
+
     def stage(self):
-        if self.arming_status.done is False:
+        if not self.arming_status.done:
             # Arming has started so wait for it to finish
             self.arming_status.wait(60)
-        else:
-            if self.odin.fan.ready.get() != 1:
-                # Arming hasn't started, do it asynchronously
-                self.async_stage()
+        elif not self.is_armed():
+            # Arming hasn't started, do it asynchronously
+            self.async_stage().wait(timeout=self.GENERAL_STATUS_TIMEOUT)
 
     def unstage(self) -> bool:
         assert self.detector_params is not None

tests/devices/unit_tests/test_eiger.py

@@ -546,6 +546,7 @@ def test_if_eiger_isnt_armed_then_stage_calls_async_stage(fake_eiger: EigerDetec
 
 def test_if_eiger_is_armed_then_stage_does_nothing(fake_eiger: EigerDetector):
     fake_eiger.odin.fan.ready.sim_put(1)
+    fake_eiger.cam.acquire.sim_put(1)
     fake_eiger.async_stage = MagicMock()
     fake_eiger.stage()
     fake_eiger.async_stage.assert_not_called()