Move main test suite to new use new test environment.

tests/test_stage.py

@@ -1,10 +1,8 @@
 """Test the stage without creating a full HTTP server and socket connection."""
 
 import itertools
-import tempfile
 
 import pytest
-from fastapi.testclient import TestClient
 from httpx import HTTPStatusError
 from hypothesis import HealthCheck, given, settings
 from hypothesis import strategies as st
@@ -12,12 +10,15 @@ from hypothesis import strategies as st
 import labthings_fastapi as lt
 from labthings_fastapi.testing import create_thing_without_server
 
+from openflexure_microscope_server.things.camera.simulation import SimulatedCamera
 from openflexure_microscope_server.things.stage import (
     BaseStage,
     RedefinedBaseMovementError,
 )
 from openflexure_microscope_server.things.stage.dummy import DummyStage
 
+from .utilities.lt_test_utils import LabThingsTestEnv
+
 # Keep the size and number of moves fairly small or the tests can take forever
 point3d = st.tuples(
     st.integers(min_value=-100, max_value=100),
@@ -34,18 +35,6 @@ def dummy_stage():
     return create_thing_without_server(DummyStage, step_time=0.000001)
 
 
-@pytest.fixture
-def stage_server():
-    """Yield a server with a very basic configuration."""
-    thing_conf = {
-        "camera": "openflexure_microscope_server.things.camera.simulation:SimulatedCamera",
-        "stage": "openflexure_microscope_server.things.stage.dummy:DummyStage",
-    }
-    with tempfile.TemporaryDirectory() as tmpdir:
-        server = lt.ThingServer(things=thing_conf, settings_folder=tmpdir)
-        yield server
-
-
 def test_override_base_movement():
     """Child classes of stage should implement functions in the hardware reference frame.
 
@@ -157,11 +146,12 @@ def test_direction_inversion(dummy_stage):
     assert dummy_stage.axis_inverted == {"x": True, "y": False, "z": False}
 
 
-def test_direction_errors_local_and_http(stage_server):
+def test_direction_errors_local_and_http():
     """Check for expected errors both locally and over http."""
-    dummy_stage = stage_server.things["stage"]
-    with TestClient(stage_server.app) as test_client:
-        stage_client = lt.ThingClient.from_url("/stage/", client=test_client)
+    thing_conf = {"camera": SimulatedCamera, "stage": DummyStage}
+    with LabThingsTestEnv(things=thing_conf) as test_env:
+        dummy_stage = test_env.get_thing_by_type(DummyStage)
+        stage_client = test_env.get_thing_client("stage")
 
         assert stage_client.axis_inverted == {"x": True, "y": False, "z": False}
         # Can't set an arbitrary value via a client as read only: