From ecfdcb1c05cc9c0a0b464bb51aaeca3ab57be627 Mon Sep 17 00:00:00 2001 From: David Perl Date: Fri, 12 Apr 2024 14:56:22 +0100 Subject: [PATCH 1/3] update to match dodal #433 --- setup.cfg | 2 +- src/hyperion/log.py | 2 +- tests/conftest.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index d91c2e93c..e8e48b9bf 100644 --- a/setup.cfg +++ b/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 diff --git a/src/hyperion/log.py b/src/hyperion/log.py index f9fe3e12b..45ca17215 100755 --- a/src/hyperion/log.py +++ b/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 diff --git a/tests/conftest.py b/tests/conftest.py index 7bb5608f5..44e19d53a 100644 --- a/tests/conftest.py +++ b/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() From c9eb0c41b0d94db411559608e76bc87379c915c1 Mon Sep 17 00:00:00 2001 From: David Perl Date: Fri, 12 Apr 2024 15:35:15 +0100 Subject: [PATCH 2/3] fix zebra mocks --- tests/conftest.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 44e19d53a..c867d7a34 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -457,9 +457,11 @@ 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) - ) + def mock_side(*args, **kwargs): + zebra.pc.arm.armed._backend._set_value(*args, **kwargs) # type: ignore + return Status(done=True, success=True) + + mock_arm_disarm = MagicMock(side_effect=mock_side) zebra.pc.arm.set = mock_arm_disarm smargon.omega.velocity.set = mock_omega_sets smargon.omega.set = mock_omega_sets @@ -495,9 +497,12 @@ 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) - ) + def mock_side(*args, **kwargs): + zebra.pc.arm.armed._backend._set_value(*args, **kwargs) # type: ignore + return Status(done=True, success=True) + + mock_arm_disarm = MagicMock(side_effect=mock_side) + zebra.pc.arm.set = mock_arm_disarm smargon.omega.velocity.set = mock_omega_velocity_sets smargon.omega.set = mock_omega_sets From 230767ec785fb1c5370209cba00c1ed8d52c5114 Mon Sep 17 00:00:00 2001 From: Dominic Oram Date: Sun, 14 Apr 2024 18:59:57 +0100 Subject: [PATCH 3/3] Update zebra fixture to mock arming properly --- tests/conftest.py | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index c867d7a34..15e4020cb 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -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,12 +458,6 @@ def fake_create_devices( ): mock_omega_sets = MagicMock(return_value=Status(done=True, success=True)) - def mock_side(*args, **kwargs): - zebra.pc.arm.armed._backend._set_value(*args, **kwargs) # type: ignore - return Status(done=True, success=True) - - mock_arm_disarm = MagicMock(side_effect=mock_side) - zebra.pc.arm.set = mock_arm_disarm smargon.omega.velocity.set = mock_omega_sets smargon.omega.set = mock_omega_sets @@ -497,13 +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)) - def mock_side(*args, **kwargs): - zebra.pc.arm.armed._backend._set_value(*args, **kwargs) # type: ignore - return Status(done=True, success=True) - - mock_arm_disarm = MagicMock(side_effect=mock_side) - - zebra.pc.arm.set = mock_arm_disarm smargon.omega.velocity.set = mock_omega_velocity_sets smargon.omega.set = mock_omega_sets