From aaf408451756041e397e93a53364d84132f8676f Mon Sep 17 00:00:00 2001 From: appel_c Date: Thu, 31 Jul 2025 15:54:54 +0200 Subject: [PATCH 1/2] fix: rename .service_config to .config --- debye_bec/services/NIDAQ_writer/NIDAQ_writer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debye_bec/services/NIDAQ_writer/NIDAQ_writer.py b/debye_bec/services/NIDAQ_writer/NIDAQ_writer.py index cbb38f2..33c103d 100644 --- a/debye_bec/services/NIDAQ_writer/NIDAQ_writer.py +++ b/debye_bec/services/NIDAQ_writer/NIDAQ_writer.py @@ -28,7 +28,7 @@ class NIDAQWriterService(BECService): def __init__(self, config: ServiceConfig, connector_cls: RedisConnector) -> None: super().__init__(config=config, connector_cls=connector_cls, unique_service=True) self.queue = queue.Queue() - config = self._service_config.service_config.get("file_writer") + config = self._service_config.config.get("file_writer") self.writer_mixin = FileWriter(service_config=config) self._scan_status_consumer = None self._ni_data_consumer = None -- 2.49.1 From 6a1992f605f73ff486ae2bb8f6353899b64c1e9b Mon Sep 17 00:00:00 2001 From: appel_c Date: Thu, 31 Jul 2025 15:55:08 +0200 Subject: [PATCH 2/2] fix(test-mo1-bragg): fix test for mo1_bragg mov succeeds. --- tests/tests_devices/test_mo1_bragg.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/tests_devices/test_mo1_bragg.py b/tests/tests_devices/test_mo1_bragg.py index 0c66506..ac7066b 100644 --- a/tests/tests_devices/test_mo1_bragg.py +++ b/tests/tests_devices/test_mo1_bragg.py @@ -74,15 +74,16 @@ def test_egu(mock_bragg): def test_move_succeeds(mock_bragg): dev = mock_bragg dev.move_abs._read_pv.mock_data = 0 - # Move succeeds - with mock.patch.object(dev.motor_is_moving._read_pv, "mock_data", side_effect=[0, 1]): - status = dev.move(0.5) - # Sleep needed to allow thread to resolive in _move_and_finish, i.e. and the 0.25s sleep inside the function - time.sleep(1) - assert status.done is True - assert status.success is True - assert dev.setpoint.get() == 0.5 - assert dev.move_abs.get() == 1 + dev.motor_is_moving._read_pv.mock_data = 0 + + status = dev.move(0.5) + assert status.done is False + dev.motor_is_moving._read_pv.mock_data = 1 + status.wait(timeout=3) # Callback should within that time + assert status.done is True + assert status.success is True + assert dev.setpoint.get() == 0.5 + assert dev.move_abs.get() == 1 def test_stop_move(mock_bragg): -- 2.49.1