diff --git a/tests/tests_devices/test_pilatus.py b/tests/tests_devices/test_pilatus.py index 2f1bb01..fc02311 100644 --- a/tests/tests_devices/test_pilatus.py +++ b/tests/tests_devices/test_pilatus.py @@ -6,23 +6,14 @@ from unittest import mock import ophyd import pytest from bec_lib.messages import ScanStatusMessage -from bec_server.scan_server.scan_worker import ScanWorker -from bec_server.scan_server.scans.scan_base import ScanInfo as ScanServerScanInfo from bec_server.scan_server.tests.scan_fixtures import * from bec_server.scan_server.tests.scan_fixtures import _MockDevice -from ophyd_devices import CompareStatus, DeviceStatus +from ophyd_devices import DeviceStatus from ophyd_devices.interfaces.base_classes.psi_device_base import DeviceStoppedError from ophyd_devices.tests.utils import MockPV, patch_dual_pvs from ophyd_devices.utils.psi_device_base_utils import TaskStatus -from debye_bec.devices.pilatus.pilatus import ( - ACQUIREMODE, - COMPRESSIONALGORITHM, - DETECTORSTATE, - FILEWRITEMODE, - TRIGGERMODE, - Pilatus, -) +from debye_bec.devices.pilatus.pilatus import ACQUIREMODE, DETECTORSTATE, Pilatus from debye_bec.devices.utils.utils import fetch_scan_info if TYPE_CHECKING: # pragma no cover @@ -38,8 +29,8 @@ if TYPE_CHECKING: # pragma no cover @pytest.fixture( scope="function", params=[ - (("samx", 0.1, 1, 5, "samy", 0, 1, 5), {"relative": True}, "_v4_hexagonal_scan"), - ((1, 0.2), {}, "_v4_time_scan"), + (("samx", 0.1, 1, 5, "samy", 0, 1, 5), {"relative": True}, "hexagonal_scan"), + ((1, 0.2), {}, "time_scan"), ((9000, 10000, 1, 20, 0.1, 9500), {}, "xas_advanced_scan"), ], )