From 34fdc39ebc7ecb0d48e6a1c466f6b2e73a897960 Mon Sep 17 00:00:00 2001 From: appel_c Date: Tue, 14 May 2024 18:39:46 +0200 Subject: [PATCH] refactor: moved patch pvs to conftest.py --- tests/__init__.py | 0 tests/{utils.py => tests_devices/conftest.py} | 0 tests/tests_devices/test_eiger9m_csaxs.py | 1 - tests/tests_devices/test_falcon_csaxs.py | 1 - tests/tests_devices/test_mcs_card.py | 1 - tests/tests_devices/test_pilatus_csaxs.py | 1 - 6 files changed, 4 deletions(-) delete mode 100644 tests/__init__.py rename tests/{utils.py => tests_devices/conftest.py} (100%) diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/utils.py b/tests/tests_devices/conftest.py similarity index 100% rename from tests/utils.py rename to tests/tests_devices/conftest.py diff --git a/tests/tests_devices/test_eiger9m_csaxs.py b/tests/tests_devices/test_eiger9m_csaxs.py index 1217345..64cfdcd 100644 --- a/tests/tests_devices/test_eiger9m_csaxs.py +++ b/tests/tests_devices/test_eiger9m_csaxs.py @@ -10,7 +10,6 @@ from bec_server.device_server.tests.utils import DMMock from ophyd_devices.tests.utils import MockPV from csaxs_bec.devices.epics.devices.eiger9m_csaxs import Eiger9McSAXS -from tests.utils import patch_dual_pvs @pytest.fixture(scope="function") diff --git a/tests/tests_devices/test_falcon_csaxs.py b/tests/tests_devices/test_falcon_csaxs.py index 3bc581d..4022a99 100644 --- a/tests/tests_devices/test_falcon_csaxs.py +++ b/tests/tests_devices/test_falcon_csaxs.py @@ -11,7 +11,6 @@ from bec_server.device_server.tests.utils import DMMock from ophyd_devices.tests.utils import MockPV from csaxs_bec.devices.epics.devices.falcon_csaxs import FalconcSAXS, FalconTimeoutError -from tests.utils import patch_dual_pvs @pytest.fixture(scope="function") diff --git a/tests/tests_devices/test_mcs_card.py b/tests/tests_devices/test_mcs_card.py index ff87b15..4afb1a4 100644 --- a/tests/tests_devices/test_mcs_card.py +++ b/tests/tests_devices/test_mcs_card.py @@ -16,7 +16,6 @@ from csaxs_bec.devices.epics.mcs_csaxs import ( ReadoutMode, TriggerSource, ) -from tests.utils import patch_dual_pvs @pytest.fixture(scope="function") diff --git a/tests/tests_devices/test_pilatus_csaxs.py b/tests/tests_devices/test_pilatus_csaxs.py index 617935f..d3b2eda 100644 --- a/tests/tests_devices/test_pilatus_csaxs.py +++ b/tests/tests_devices/test_pilatus_csaxs.py @@ -11,7 +11,6 @@ from bec_server.device_server.tests.utils import DMMock from ophyd_devices.tests.utils import MockPV from csaxs_bec.devices.epics.devices.pilatus_csaxs import PilatuscSAXS -from tests.utils import patch_dual_pvs @pytest.fixture(scope="function")