fix motor limits test, fix deprecationwarnings for ophyd_async.testing imports

Author: rerpha

tests/devices/simpledae/test_controllers.py

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

tests/devices/simpledae/test_reducers.py

@@ -6,7 +6,7 @@
 import numpy as np
 import pytest
 import scipp as sc
-from ophyd_async.testing import get_mock_put, set_mock_value
+from ophyd_async.core import get_mock_put, set_mock_value
 
 from ibex_bluesky_core.devices.simpledae import (
     VARIANCE_ADDITION,

tests/devices/simpledae/test_simpledae.py

@@ -1,8 +1,7 @@
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
-from ophyd_async.core import Device, StandardReadable, soft_signal_rw
-from ophyd_async.testing import set_mock_value
+from ophyd_async.core import Device, StandardReadable, set_mock_value, soft_signal_rw
 
 from ibex_bluesky_core.devices.dae import Dae, DaeCheckingSignal
 from ibex_bluesky_core.devices.simpledae import (

tests/devices/simpledae/test_waiters.py

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

tests/devices/test_block.py

@@ -6,7 +6,7 @@
 import bluesky.plans as bp
 import ophyd_async
 import pytest
-from ophyd_async.testing import get_mock_put, set_mock_value
+from ophyd_async.core import get_mock_put, set_mock_value
 
 from ibex_bluesky_core.devices.block import (
     GLOBAL_MOVING_FLAG_PRE_WAIT,
@@ -365,6 +365,8 @@ async def test_block_mot_set_outside_limits(mot_block):
 
     set_mock_value(mot_block.user_setpoint, 10)
     set_mock_value(mot_block.velocity, 10)
+    set_mock_value(mot_block.dial_high_limit_travel, 15)
+    set_mock_value(mot_block.dial_low_limit_travel, 5)
     set_mock_value(mot_block.high_limit_travel, 15)
     set_mock_value(mot_block.low_limit_travel, 5)
     with pytest.raises(err):

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.testing import get_mock_put, set_mock_value
+from ophyd_async.core 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 import (

tests/devices/test_reflectometry.py

@@ -5,8 +5,8 @@
 import bluesky.plan_stubs as bps
 import numpy as np
 import pytest
+from ophyd_async.core import callback_on_mock_put, get_mock_put, set_mock_value
 from ophyd_async.plan_stubs import ensure_connected
-from ophyd_async.testing import callback_on_mock_put, get_mock_put, set_mock_value
 
 from ibex_bluesky_core.devices import NoYesChoice
 from ibex_bluesky_core.devices.dae import Dae

tests/plans/test_det_map_align.py

@@ -3,8 +3,7 @@
 
 import numpy as np
 import pytest
-from ophyd_async.core import soft_signal_rw
-from ophyd_async.testing import callback_on_mock_put, set_mock_value
+from ophyd_async.core import callback_on_mock_put, set_mock_value, soft_signal_rw
 
 from ibex_bluesky_core.devices.simpledae import (
     PeriodPerPointController,

tests/plans/test_init.py

@@ -7,8 +7,8 @@
 import pytest
 from bluesky.preprocessors import run_decorator
 from ophyd_async.plan_stubs import ensure_connected
+from ophyd_async.core import callback_on_mock_put, get_mock_put, set_mock_value
 from ophyd_async.sim import SimMotor
-from ophyd_async.testing import callback_on_mock_put, get_mock_put, set_mock_value
 
 from ibex_bluesky_core.devices.block import BlockMot, BlockR, BlockRw
 from ibex_bluesky_core.devices.simpledae import (

tests/test_plan_stubs.py

@@ -9,9 +9,9 @@
 from bluesky import RunEngine
 from bluesky import plan_stubs as bps
 from bluesky.utils import Msg
+from ophyd_async.core import get_mock_put, set_mock_value
 from ophyd_async.epics.motor import UseSetMode
 from ophyd_async.plan_stubs import ensure_connected
-from ophyd_async.testing import get_mock_put, set_mock_value
 
 from ibex_bluesky_core.devices import NoYesChoice, compress_and_hex, dehex_and_decompress
 from ibex_bluesky_core.devices.block import BlockMot