bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2026-01-20 17:02:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(deprecation): remove all remaining .dumps(), .loads() and producer->connector

Browse Source
This commit is contained in:
guijar_m
2024-02-13 15:43:51 +01:00
committed by appel_c
parent a48bc73cc5
commit 4159f3e3ec
18 changed files with 81 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_pilatus_csaxs.py
View File

@@ -28,7 +28,7 @@ def mock_det():
prefix = "X12SA-ES-PILATUS300K:"
sim_mode = False
dm = DMMock()
with mock.patch.object(dm, "producer"):
with mock.patch.object(dm, "connector"):
with mock.patch(
"ophyd_devices.epics.devices.psi_detector_base.FileWriterMixin"
), mock.patch(
@@ -207,27 +207,27 @@ def test_publish_file_location(mock_det, scaninfo):
file_path=scaninfo["filepath"],
done=scaninfo["done"],
metadata={"input_path": scaninfo["filepath_raw"]},
).dumps()
)
else:
msg = messages.FileMessage(
file_path=scaninfo["filepath"],
done=scaninfo["done"],
metadata={"input_path": scaninfo["filepath_raw"]},
successful=scaninfo["successful"],
).dumps()
)
expected_calls = [
mock.call(
MessageEndpoints.public_file(scaninfo["scanID"], mock_det.name),
msg,
pipe=mock_det.producer.pipeline.return_value,
pipe=mock_det.connector.pipeline.return_value,
),
mock.call(
MessageEndpoints.file_event(mock_det.name),
msg,
pipe=mock_det.producer.pipeline.return_value,
pipe=mock_det.connector.pipeline.return_value,
),
]
assert mock_det.producer.set_and_publish.call_args_list == expected_calls
assert mock_det.connector.set_and_publish.call_args_list == expected_calls
@pytest.mark.parametrize(