rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the conftest defined fixtures as mock methods return mocks already removing the need for the defined mocks

Browse source
This commit is contained in:
Julian Stirling 2025-08-24 19:22:19 +01:00
parent 867cd0cad1
commit e53f4e3b2b
4 changed files with 16 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/test_server_cli.py
View file

@ -18,12 +18,13 @@ def test_no_config():
ofm_server.serve_from_cli([])
def test_successful_start(mock_server, mocker, caplog):
def test_successful_start(mocker, caplog):
"""Check some basic things from the microscope setup.
This test checks that logging is set up and that the actual function used for
handling shutdown events shuts down the mjpeg streams.
"""
mock_server = mocker.Mock()
# Create a mock for the camera so we can check the MJPEG streams are closed on
# shutdown.
mock_camera = mocker.Mock()
@ -69,11 +70,12 @@ def test_successful_start(mock_server, mocker, caplog):
assert str(caplog.records[0].msg) == "mock-54321"
def test_failed_customise(mock_server, mocker):
def test_failed_customise(mocker):
"""Check what happens if there is an error before the server is started by uvicorn.
This differs based on whether the --fallback flag is set.
"""
mock_server = mocker.Mock()
# Mock the LabThings function that returns the server so we have a mock server
mocker.patch(
"openflexure_microscope_server.server.lt.cli.server_from_config",