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

Stricter rules on pytest.raises, requiring match for generic error types

Browse source 
Closes #560
This commit is contained in:
Julian Stirling 2025-10-28 17:20:40 +00:00
parent a89306b3b8
commit e4cb48eb6d
3 changed files with 34 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
tests/test_stack.py
View file

@ -86,7 +86,12 @@ def test_stack_params_not_enough_test_images(save_ims, extra_ims):
For arguments see test_stack_params_validation
"""
with pytest.raises(ValueError):
# Depending on the values multiple messages are possible
match = (
"(Can't test for focus with fewer than 3 images|"
"Can't save more images than the minimum number tested)"
)
with pytest.raises(ValueError, match=match):
StackParams(
stack_dz=50,
images_to_save=save_ims,
@ -106,7 +111,12 @@ def test_stack_params_negative_images_to_save(save_ims, extra_ims):
For arguments see test_stack_params_validation
"""
with pytest.raises(ValueError):
# Depending on the values multiple messages are possible
match = (
"(Can't test for focus with fewer than 3 images|"
"Images to save must be positive and odd)"
)
with pytest.raises(ValueError, match=match):
StackParams(
stack_dz=50,
images_to_save=save_ims,
@ -126,7 +136,13 @@ def test_even_min_images_to_test(save_ims, extra_ims):
For arguments see test_stack_params_validation
"""
with pytest.raises(ValueError):
# Depending on the values multiple messages are possible
match = (
"(Can't test for focus with fewer than 3 images|"
"Testing with more than 9 images is|" # may give more than 9 which errors first
"Minimum number of images to test should be positive and odd)"
)
with pytest.raises(ValueError, match=match):
StackParams(
stack_dz=50,
images_to_save=save_ims,
@ -146,7 +162,11 @@ def test_even_images_to_save(save_ims, extra_ims):
For arguments see test_stack_params_validation
"""
with pytest.raises(ValueError):
match = (
"(Can't test for focus with fewer than 3 images|"
"Images to save must be positive and odd)"
)
with pytest.raises(ValueError, match=match):
StackParams(
stack_dz=50,
images_to_save=save_ims,
@ -232,13 +252,13 @@ def test_retrieval_of_captures(start):
assert _get_capture_by_id(captures, buffer_id) is capture
# Check errors are raised when supplying ids that aren't in the list
with pytest.raises(ValueError):
with pytest.raises(ValueError, match="No capture has a buffer id of"):
_get_capture_index_by_id(captures, start - 1)
with pytest.raises(ValueError):
with pytest.raises(ValueError, match="No capture has a buffer id of"):
_get_capture_index_by_id(captures, start + 21)
with pytest.raises(ValueError):
with pytest.raises(ValueError, match="No capture has a buffer id of"):
_get_capture_by_id(captures, start - 1)
with pytest.raises(ValueError):
with pytest.raises(ValueError, match="No capture has a buffer id of"):
_get_capture_by_id(captures, start + 21)