bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2025-06-23 19:27:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: fix bec_lib imports

Browse Source
This commit is contained in:
usov_i
2023-11-13 08:28:09 +01:00
parent 3c173f59f7
commit d851cf6f8e
23 changed files with 74 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_eiger9m_csaxs.py
View File

@ -4,7 +4,7 @@ from unittest import mock
import ophyd
from bec_lib.core import BECMessage, MessageEndpoints
from bec_lib import messages, MessageEndpoints
from ophyd_devices.epics.devices.eiger9m_csaxs import Eiger9McSAXS
from tests.utils import DMMock, MockPV
@ -413,9 +413,9 @@ def test_publish_file_location(mock_det, scaninfo):
mock_det.filepath = scaninfo["filepath"]
mock_det._publish_file_location(done=scaninfo["done"], successful=scaninfo["successful"])
if scaninfo["successful"] is None:
msg = BECMessage.FileMessage(file_path=scaninfo["filepath"], done=scaninfo["done"]).dumps()
msg = messages.FileMessage(file_path=scaninfo["filepath"], done=scaninfo["done"]).dumps()
else:
msg = BECMessage.FileMessage(
msg = messages.FileMessage(
file_path=scaninfo["filepath"], done=scaninfo["done"], successful=scaninfo["successful"]
).dumps()
expected_calls = [

6
tests/test_falcon_csaxs.py
View File

@ -7,7 +7,7 @@ import ophyd
from ophyd_devices.epics.devices.falcon_csaxs import FalconcSAXS, FalconTimeoutError
from tests.utils import DMMock, MockPV
from bec_lib.core import BECMessage, MessageEndpoints
from bec_lib import messages, MessageEndpoints
def patch_dual_pvs(device):
@ -210,9 +210,9 @@ def test_publish_file_location(mock_det, scaninfo):
mock_det.filepath = scaninfo["filepath"]
mock_det._publish_file_location(done=scaninfo["done"], successful=scaninfo["successful"])
if scaninfo["successful"] is None:
msg = BECMessage.FileMessage(file_path=scaninfo["filepath"], done=scaninfo["done"]).dumps()
msg = messages.FileMessage(file_path=scaninfo["filepath"], done=scaninfo["done"]).dumps()
else:
msg = BECMessage.FileMessage(
msg = messages.FileMessage(
file_path=scaninfo["filepath"], done=scaninfo["done"], successful=scaninfo["successful"]
).dumps()
expected_calls = [

6
tests/test_pilatus_csaxs.py
View File

@ -5,7 +5,7 @@ from unittest import mock
import ophyd
from bec_lib.core import BECMessage, MessageEndpoints
from bec_lib import messages, MessageEndpoints
from ophyd_devices.epics.devices.pilatus_csaxs import PilatuscSAXS
from tests.utils import DMMock, MockPV
@ -172,9 +172,9 @@ def test_publish_file_location(mock_det, scaninfo):
mock_det.filepath = scaninfo["filepath"]
mock_det._publish_file_location(done=scaninfo["done"], successful=scaninfo["successful"])
if scaninfo["successful"] is None:
msg = BECMessage.FileMessage(file_path=scaninfo["filepath"], done=scaninfo["done"]).dumps()
msg = messages.FileMessage(file_path=scaninfo["filepath"], done=scaninfo["done"]).dumps()
else:
msg = BECMessage.FileMessage(
msg = messages.FileMessage(
file_path=scaninfo["filepath"], done=scaninfo["done"], successful=scaninfo["successful"]
).dumps()
expected_calls = [

4
tests/utils.py
View File

@ -1,5 +1,5 @@
from bec_lib.core.devicemanager import DeviceContainer
from bec_lib.core.tests.utils import ProducerMock
from bec_lib.devicemanager import DeviceContainer
from bec_lib.tests.utils import ProducerMock
from unittest import mock