Hutch shutter raises an error on Open if not safe (#1285)

* Just a thought to get around I19 testing issue

* Shutter only raise error for hutch not safe on open

* Fix test

* Add small test

Author: noemifrisina

src/dodal/devices/hutch_shutter.py

@@ -81,14 +81,14 @@ def __init__(self, prefix: str, name: str = "") -> None:
 
     @AsyncStatus.wrap
     async def set(self, value: ShutterDemand):
-        interlock_state = await self.interlock.shutter_safe_to_operate()
-        if not interlock_state and not TEST_MODE:
-            # If not in test mode, fail. If in test mode, the optics hutch may be open.
-            raise ShutterNotSafeToOperateError(
-                "The hutch has not been locked, not operating shutter."
-            )
         if not TEST_MODE:
             if value == ShutterDemand.OPEN:
+                interlock_state = await self.interlock.shutter_safe_to_operate()
+                if not interlock_state:
+                    # If not in test mode, fail. If in test mode, the optics hutch may be open.
+                    raise ShutterNotSafeToOperateError(
+                        "The hutch has not been locked, not operating shutter."
+                    )
                 await self.control.set(ShutterDemand.RESET, wait=True)
                 await self.control.set(value, wait=True)
                 return await wait_for_value(

tests/devices/unit_tests/test_hutch_shutter.py

@@ -35,14 +35,23 @@ def test_shutter_can_be_created(fake_shutter: HutchShutter):
     assert isinstance(fake_shutter, HutchShutter)
 
 
-async def test_shutter_raises_error_on_set_if_hutch_not_interlocked(
+async def test_shutter_raises_error_on_set_if_hutch_not_interlocked_on_open(
     fake_shutter: HutchShutter,
 ):
     set_mock_value(fake_shutter.interlock.status, 1)
     assert await fake_shutter.interlock.shutter_safe_to_operate() is False
 
     with pytest.raises(ShutterNotSafeToOperateError):
-        await fake_shutter.set(ShutterDemand.CLOSE)
+        await fake_shutter.set(ShutterDemand.OPEN)
+
+
+async def test_shutter_does_not_error_on_close_even_if_hutch_not_interlocked(
+    fake_shutter: HutchShutter,
+):
+    set_mock_value(fake_shutter.interlock.status, 1)
+    assert await fake_shutter.interlock.shutter_safe_to_operate() is False
+
+    await fake_shutter.set(ShutterDemand.CLOSE)
 
 
 @pytest.mark.parametrize(