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

Merge branch 'live-scan-details' into 'v3'

Browse source 
Return more live scan details for the UI

See merge request openflexure/openflexure-microscope-server!641
This commit is contained in:
Joe Knapper 2026-07-06 14:03:58 +00:00
commit dcf5751310
5 changed files with 125 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/unit_tests/test_smart_scan.py
View file

@ -92,7 +92,7 @@ def test_initial_properties(entered_smart_scan_thing):
"""
smart_scan_thing = entered_smart_scan_thing
assert smart_scan_thing._scan_dir_manager.base_dir == SCAN_DIR
assert smart_scan_thing.latest_scan_name is None
assert smart_scan_thing.latest_scan_live_details is None
@dataclass
@ -559,7 +559,7 @@ def test_run_scan_cancelled(scan_thing_mocked_for_run_scan, caplog, mocker):
scan_thing, "_main_scan_loop", side_effect=InvocationCancelledError()
)
result, logs, calls = check_run_scan(scan_thing, caplog)
result, logs, calls = check_run_scan(scan_thing, caplog, InvocationCancelledError)
assert result == "cancelled by user"
# No logs at warning level.
@ -571,7 +571,7 @@ def test_run_scan_cancelled(scan_thing_mocked_for_run_scan, caplog, mocker):
"cam_change_streaming_mode_calls": 2,
"main_scan_loop_calls": 1,
"return_to_start_calls": 1,
"perform_final_stitch_calls": 1,
"perform_final_stitch_calls": 0,
"save_scan_data_calls": 2,
}
assert calls == expected_calls_numbers