Merge branch 'main' into com_callback

Author: rerpha

tests/devices/simpledae/test_controllers.py

@@ -1,5 +1,5 @@
 import pytest
-from ophyd_async.core import get_mock_put, set_mock_value
+from ophyd_async.testing import get_mock_put, set_mock_value
 
 from ibex_bluesky_core.devices.dae.dae import RunstateEnum
 from ibex_bluesky_core.devices.dae.dae_controls import BeginRunExBits

tests/devices/simpledae/test_reducers.py

@@ -3,7 +3,7 @@
 
 import pytest
 import scipp as sc
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from ibex_bluesky_core.devices.simpledae import SimpleDae
 from ibex_bluesky_core.devices.simpledae.reducers import (

tests/devices/simpledae/test_waiters.py

@@ -1,7 +1,7 @@
 import asyncio
 
 import pytest
-from ophyd_async.core import set_mock_value
+from ophyd_async.testing import set_mock_value
 
 from ibex_bluesky_core.devices.simpledae import SimpleDae
 from ibex_bluesky_core.devices.simpledae.waiters import (

tests/devices/test_block.py

@@ -7,7 +7,7 @@
 import bluesky.plan_stubs as bps
 import bluesky.plans as bp
 import pytest
-from ophyd_async.core import get_mock_put, set_mock_value
+from ophyd_async.testing import get_mock_put, set_mock_value
 
 from ibex_bluesky_core.devices.block import (
     GLOBAL_MOVING_FLAG_PRE_WAIT,

tests/devices/test_dae.py

@@ -9,7 +9,7 @@
 import scipp as sc
 import scipp.testing
 from bluesky.run_engine import RunEngine
-from ophyd_async.core import get_mock_put, set_mock_value
+from ophyd_async.testing import get_mock_put, set_mock_value
 
 from ibex_bluesky_core.devices import compress_and_hex, dehex_and_decompress
 from ibex_bluesky_core.devices.dae.dae import Dae, RunstateEnum

tests/test_preprocessors.py

@@ -6,8 +6,8 @@
 import pytest
 from bluesky import preprocessors as bpp
 from bluesky.utils import Msg
-from ophyd_async.core import set_mock_value
 from ophyd_async.epics.core import epics_signal_r
+from ophyd_async.testing import set_mock_value
 
 from ibex_bluesky_core.preprocessors import _get_rb_number_signal, add_rb_number_processor
 from tests.conftest import MOCK_PREFIX