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

Merge branch 'error-types' into 'v3'

Browse source 
Tweak a few error types.

Closes #320

See merge request openflexure/openflexure-microscope-server!376
This commit is contained in:
Julian Stirling 2025-08-27 13:47:26 +00:00
commit 5515d55e6d
4 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/test_scan_planners.py
View file

@ -14,11 +14,15 @@ from .utilities import scan_test_helpers
def test_enforce_xy_tuple():
"""Check that 2 value tuples (or ValueErrors) are always returned."""
bad_len_vals = [[1], [], (1,), (2, 4, 4), [1, 4, 5, 7]]
bad_type_vals = ["hi", 1, {"this": "that"}, {1, 2}]
for value in bad_len_vals + bad_type_vals:
for value in bad_len_vals:
with pytest.raises(ValueError):
scan_planners.enforce_xy_tuple(value)
bad_type_vals = ["hi", 1, {"this": "that"}, {1, 2}]
for value in bad_type_vals:
with pytest.raises(TypeError):
scan_planners.enforce_xy_tuple(value)
assert (1, 6) == scan_planners.enforce_xy_tuple((1, 6))
assert (1, 6) == scan_planners.enforce_xy_tuple([1, 6])
@ -26,11 +30,15 @@ def test_enforce_xy_tuple():
def test_enforce_xyz_tuple():
"""Check that 3 value tuples (or ValueErrors) are always returned."""
bad_len_vals = [[1], [], (1,), (2, 4), [1, 4, 5, 7]]
bad_type_vals = ["hi!", 1, {"this": "that"}, {1, 2, 3}]
for value in bad_len_vals + bad_type_vals:
for value in bad_len_vals:
with pytest.raises(ValueError):
scan_planners.enforce_xyz_tuple(value)
bad_type_vals = ["hi!", 1, {"this": "that"}, {1, 2, 3}]
for value in bad_type_vals:
with pytest.raises(TypeError):
scan_planners.enforce_xyz_tuple(value)
assert (1, 6, 2) == scan_planners.enforce_xyz_tuple((1, 6, 2))
assert (1, 6, 6) == scan_planners.enforce_xyz_tuple([1, 6, 6])