Skip to content

Commit a4795d3

Browse files
authored
Merge branch 'main' into com_callback
2 parents 69c8fe1 + 397dfdc commit a4795d3

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

tests/devices/simpledae/test_controllers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import pytest
2-
from ophyd_async.core import get_mock_put, set_mock_value
2+
from ophyd_async.testing import get_mock_put, set_mock_value
33

44
from ibex_bluesky_core.devices.dae.dae import RunstateEnum
55
from ibex_bluesky_core.devices.dae.dae_controls import BeginRunExBits

tests/devices/simpledae/test_reducers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import pytest
55
import scipp as sc
6-
from ophyd_async.core import set_mock_value
6+
from ophyd_async.testing import set_mock_value
77

88
from ibex_bluesky_core.devices.simpledae import SimpleDae
99
from ibex_bluesky_core.devices.simpledae.reducers import (

tests/devices/simpledae/test_waiters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import asyncio
22

33
import pytest
4-
from ophyd_async.core import set_mock_value
4+
from ophyd_async.testing import set_mock_value
55

66
from ibex_bluesky_core.devices.simpledae import SimpleDae
77
from ibex_bluesky_core.devices.simpledae.waiters import (

tests/devices/test_block.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import bluesky.plan_stubs as bps
88
import bluesky.plans as bp
99
import pytest
10-
from ophyd_async.core import get_mock_put, set_mock_value
10+
from ophyd_async.testing import get_mock_put, set_mock_value
1111

1212
from ibex_bluesky_core.devices.block import (
1313
GLOBAL_MOVING_FLAG_PRE_WAIT,

tests/devices/test_dae.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import scipp as sc
1010
import scipp.testing
1111
from bluesky.run_engine import RunEngine
12-
from ophyd_async.core import get_mock_put, set_mock_value
12+
from ophyd_async.testing import get_mock_put, set_mock_value
1313

1414
from ibex_bluesky_core.devices import compress_and_hex, dehex_and_decompress
1515
from ibex_bluesky_core.devices.dae.dae import Dae, RunstateEnum

tests/test_preprocessors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import pytest
77
from bluesky import preprocessors as bpp
88
from bluesky.utils import Msg
9-
from ophyd_async.core import set_mock_value
109
from ophyd_async.epics.core import epics_signal_r
10+
from ophyd_async.testing import set_mock_value
1111

1212
from ibex_bluesky_core.preprocessors import _get_rb_number_signal, add_rb_number_processor
1313
from tests.conftest import MOCK_PREFIX

0 commit comments

Comments
 (0)