Merge pull request #1315 from DiamondLightSource/dodal_433_tidy_logs

update to match dodal #433

setup.cfg

@@ -35,7 +35,7 @@ install_requires =
     xarray
     doct
     databroker
-    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@7068bf2f0e75f8fffa83693136cb555b03ce8545
+    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@030381f03b6d7433945a7579dcfabef4c658fbfa
     pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774
     scipy
     pyzmq<25 # See https://github.com/DiamondLightSource/hyperion/issues/1103

src/hyperion/log.py

@@ -60,7 +60,7 @@ def do_default_logging_setup(dev_mode=False):
         dev_mode,
         ERROR_LOG_BUFFER_LINES,
     )
-    integrate_bluesky_and_ophyd_logging(dodal_logger, handlers)
+    integrate_bluesky_and_ophyd_logging(dodal_logger)
     handlers["graylog_handler"].addFilter(tag_filter)
 
     global __logger_handlers

tests/conftest.py

@@ -91,7 +91,7 @@ def _reset_loggers(loggers):
             logger.parent = logging.getLogger()
 
 
-def clear_log_handlers(loggers):
+def clear_log_handlers(loggers: Sequence[logging.Logger]):
     for logger in loggers:
         for handler in logger.handlers:
             handler.close()
@@ -252,12 +252,13 @@ def smargon() -> Generator[Smargon, None, None]:
 def zebra():
     RunEngine()
     zebra = i03.zebra(fake_with_ophyd_sim=True)
-    mock_arm = MagicMock(
-        side_effect=zebra.pc.arm.armed._backend._set_value,
-        return_value=Status(done=True, success=True),
-    )
-    with patch.object(zebra.pc.arm.arm_set, "set", mock_arm):
-        return i03.zebra(fake_with_ophyd_sim=True)
+
+    def mock_side(*args, **kwargs):
+        zebra.pc.arm.armed._backend._set_value(*args, **kwargs)  # type: ignore
+        return Status(done=True, success=True)
+
+    zebra.pc.arm.set = MagicMock(side_effect=mock_side)
+    return zebra
 
 
 @pytest.fixture
@@ -457,10 +458,6 @@ def fake_create_devices(
 ):
     mock_omega_sets = MagicMock(return_value=Status(done=True, success=True))
 
-    mock_arm_disarm = MagicMock(
-        side_effect=zebra.pc.arm.armed.set, return_value=Status(done=True, success=True)
-    )
-    zebra.pc.arm.set = mock_arm_disarm
     smargon.omega.velocity.set = mock_omega_sets
     smargon.omega.set = mock_omega_sets
 
@@ -495,10 +492,6 @@ def fake_create_rotation_devices(
     mock_omega_sets = MagicMock(return_value=Status(done=True, success=True))
     mock_omega_velocity_sets = MagicMock(return_value=Status(done=True, success=True))
 
-    mock_arm_disarm = MagicMock(
-        side_effect=zebra.pc.arm.armed.set, return_value=Status(done=True, success=True)
-    )
-    zebra.pc.arm.set = mock_arm_disarm
     smargon.omega.velocity.set = mock_omega_velocity_sets
     smargon.omega.set = mock_omega_sets