diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 00000000..98500514 --- /dev/null +++ b/tests/__init__.py @@ -0,0 +1,4 @@ +"""Tests for the OpenFlexure Server. + +Each test suite should be run separately. +""" diff --git a/tests/shared_utils/__init__.py b/tests/shared_utils/__init__.py new file mode 100644 index 00000000..f0a5ab00 --- /dev/null +++ b/tests/shared_utils/__init__.py @@ -0,0 +1 @@ +"""Shared utilities for all test suites.""" diff --git a/tests/unit_tests/utilities/lt_test_utils.py b/tests/shared_utils/lt_test_utils.py similarity index 100% rename from tests/unit_tests/utilities/lt_test_utils.py rename to tests/shared_utils/lt_test_utils.py diff --git a/tests/unit_tests/test_camera.py b/tests/unit_tests/test_camera.py index 9275bdf2..6f49b6f3 100644 --- a/tests/unit_tests/test_camera.py +++ b/tests/unit_tests/test_camera.py @@ -9,7 +9,7 @@ import labthings_fastapi as lt from openflexure_microscope_server.things.camera.simulation import SimulatedCamera from openflexure_microscope_server.things.stage.dummy import DummyStage -from .utilities.lt_test_utils import LabThingsTestEnv +from ..shared_utils.lt_test_utils import LabThingsTestEnv @pytest.fixture diff --git a/tests/unit_tests/test_dummy_server.py b/tests/unit_tests/test_dummy_server.py index 217bc9d2..212cd814 100644 --- a/tests/unit_tests/test_dummy_server.py +++ b/tests/unit_tests/test_dummy_server.py @@ -15,7 +15,7 @@ import piexif import pytest from PIL import Image -from .utilities.lt_test_utils import LabThingsTestEnv +from ..shared_utils.lt_test_utils import LabThingsTestEnv @pytest.fixture diff --git a/tests/unit_tests/test_stage.py b/tests/unit_tests/test_stage.py index 36acba7b..65b6ab63 100644 --- a/tests/unit_tests/test_stage.py +++ b/tests/unit_tests/test_stage.py @@ -17,7 +17,7 @@ from openflexure_microscope_server.things.stage import ( ) from openflexure_microscope_server.things.stage.dummy import DummyStage -from .utilities.lt_test_utils import LabThingsTestEnv +from ..shared_utils.lt_test_utils import LabThingsTestEnv # Keep the size and number of moves fairly small or the tests can take forever point3d = st.tuples( diff --git a/tests/unit_tests/test_stitching.py b/tests/unit_tests/test_stitching.py index 0c9b52e7..31918f41 100644 --- a/tests/unit_tests/test_stitching.py +++ b/tests/unit_tests/test_stitching.py @@ -22,7 +22,7 @@ from openflexure_microscope_server.stitching import ( StitcherValidationError, ) -from .utilities.lt_test_utils import LabThingsTestEnv +from ..shared_utils.lt_test_utils import LabThingsTestEnv # A global logger pretending to the logger from a thing LOGGER = logging.getLogger("mock-thing_logger")