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

Optional args, kwargs in pytest fixtures

Browse source
This commit is contained in:
jaknapper 2026-02-24 11:46:19 +00:00 • committed by Julian Stirling
parent 294dd33bc0
commit c28afe30ab
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
tests/unit_tests/test_stack.py
View file

@ -20,8 +20,8 @@ from openflexure_microscope_server.things.autofocus import (
CaptureInfo, CaptureInfo,
NotAPeakError, NotAPeakError,
SmartStackParams, SmartStackParams,
StackParams,
StackOrigin, StackOrigin,
StackParams,
_count_turning_points, _count_turning_points,
_get_capture_by_id, _get_capture_by_id,
_get_capture_index_by_id, _get_capture_index_by_id,
@ -661,25 +661,35 @@ def test_count_turning_points():
# But only one if the dip isn't prominent # But only one if the dip isn't prominent
assert _count_turning_points(np.array([1, 2, 3, 4, 3.8, 4, 3, 2, 1])) == 1 assert _count_turning_points(np.array([1, 2, 3, 4, 3.8, 4, 3, 2, 1])) == 1
@pytest.fixture @pytest.fixture
def fake_capture(autofocus_thing): def fake_capture(autofocus_thing):
def _fake_capture(*args, **kwargs): """Return a fake capture function using the current stage Z position."""
def _fake_capture(*_args, **_kwargs):
z = autofocus_thing._stage.position["z"] z = autofocus_thing._stage.position["z"]
return CaptureInfo( return CaptureInfo(
buffer_id=f"id_{z}", buffer_id=f"id_{z}",
position={"x": 0, "y": 0, "z": z}, position={"x": 0, "y": 0, "z": z},
sharpness=1, sharpness=1,
) )
return _fake_capture return _fake_capture
@pytest.fixture @pytest.fixture
def fake_move_relative(autofocus_thing): def fake_move_relative(autofocus_thing):
def _fake_move_relative(z, **kwargs): """Return a fake move_relative function updating the stage Z position."""
def _fake_move_relative(z, **_kwargs):
autofocus_thing._stage.position["z"] += z autofocus_thing._stage.position["z"] += z
return _fake_move_relative return _fake_move_relative
def test_run_basic_stack_simple(autofocus_thing, mocker, fake_capture, fake_move_relative):
def test_run_basic_stack_simple(
autofocus_thing, mocker, fake_capture, fake_move_relative
):
"""Basic stack captures correct number of images and saves them.""" """Basic stack captures correct number of images and saves them."""
stack_params = StackParams( stack_params = StackParams(
stack_dz=10, stack_dz=10,
@ -695,13 +705,9 @@ def test_run_basic_stack_simple(autofocus_thing, mocker, fake_capture, fake_move
autofocus_thing._stage.position = {"x": 0, "y": 0, "z": 0} autofocus_thing._stage.position = {"x": 0, "y": 0, "z": 0}
autofocus_thing.capture_stack_image = mocker.Mock( autofocus_thing.capture_stack_image = mocker.Mock(side_effect=fake_capture)
side_effect=fake_capture
)
autofocus_thing._stage.move_relative = mocker.Mock( autofocus_thing._stage.move_relative = mocker.Mock(side_effect=fake_move_relative)
side_effect=fake_move_relative
)
autofocus_thing._cam.save_from_memory = mocker.Mock() autofocus_thing._cam.save_from_memory = mocker.Mock()
autofocus_thing._cam.clear_buffers = mocker.Mock() autofocus_thing._cam.clear_buffers = mocker.Mock()
@ -714,9 +720,9 @@ def test_run_basic_stack_simple(autofocus_thing, mocker, fake_capture, fake_move
assert z_positions == [0, 10, 20] assert z_positions == [0, 10, 20]
assert final_z == 30 assert final_z == 30
def test_run_basic_stack_center_origin(autofocus_thing, mocker): def test_run_basic_stack_center_origin(autofocus_thing, mocker):
"""Stack should shift start position when origin is CENTER.""" """Stack should shift start position when origin is CENTER."""
stack_params = StackParams( stack_params = StackParams(
stack_dz=10, stack_dz=10,
images_to_save=5, images_to_save=5,
@ -748,9 +754,9 @@ def test_run_basic_stack_center_origin(autofocus_thing, mocker):
first_call = autofocus_thing._stage.move_relative.call_args_list[0] first_call = autofocus_thing._stage.move_relative.call_args_list[0]
assert first_call.kwargs["z"] == expected_offset assert first_call.kwargs["z"] == expected_offset
def test_run_basic_stack_backlash_applied(autofocus_thing, mocker, fake_capture): def test_run_basic_stack_backlash_applied(autofocus_thing, mocker, fake_capture):
"""Backlash correction should overshoot and move back.""" """Backlash correction should overshoot and move back."""
stack_params = StackParams( stack_params = StackParams(
stack_dz=10, stack_dz=10,
images_to_save=3, images_to_save=3,
@ -763,9 +769,7 @@ def test_run_basic_stack_backlash_applied(autofocus_thing, mocker, fake_capture)
capture_params.images_dir = "dummy" capture_params.images_dir = "dummy"
capture_params.save_resolution = (100, 100) capture_params.save_resolution = (100, 100)
autofocus_thing.capture_stack_image = mocker.Mock( autofocus_thing.capture_stack_image = mocker.Mock(side_effect=fake_capture)
side_effect=fake_capture
)
autofocus_thing._stage.move_relative = mocker.Mock() autofocus_thing._stage.move_relative = mocker.Mock()
autofocus_thing._cam.save_from_memory = mocker.Mock() autofocus_thing._cam.save_from_memory = mocker.Mock()
@ -780,9 +784,9 @@ def test_run_basic_stack_backlash_applied(autofocus_thing, mocker, fake_capture)
# Second call = move back # Second call = move back
assert calls[1].kwargs["z"] == 50 assert calls[1].kwargs["z"] == 50
def test_run_basic_stack_end_origin(autofocus_thing, mocker, fake_capture): def test_run_basic_stack_end_origin(autofocus_thing, mocker, fake_capture):
"""END origin should shift stack fully negative before starting.""" """END origin should shift stack fully negative before starting."""
stack_params = StackParams( stack_params = StackParams(
stack_dz=10, stack_dz=10,
images_to_save=4, images_to_save=4,
@ -795,9 +799,7 @@ def test_run_basic_stack_end_origin(autofocus_thing, mocker, fake_capture):
capture_params.images_dir = "dummy" capture_params.images_dir = "dummy"
capture_params.save_resolution = (100, 100) capture_params.save_resolution = (100, 100)
autofocus_thing.capture_stack_image = mocker.Mock( autofocus_thing.capture_stack_image = mocker.Mock(side_effect=fake_capture)
side_effect=fake_capture
)
autofocus_thing._stage.move_relative = mocker.Mock() autofocus_thing._stage.move_relative = mocker.Mock()
autofocus_thing._cam.save_from_memory = mocker.Mock() autofocus_thing._cam.save_from_memory = mocker.Mock()