diff --git a/tests/tests_bec_ipython_client/test_omny_tomo_params_widget_math.py b/tests/tests_bec_ipython_client/test_omny_tomo_params_widget_math.py index e6cd8a25..ef696f7b 100644 --- a/tests/tests_bec_ipython_client/test_omny_tomo_params_widget_math.py +++ b/tests/tests_bec_ipython_client/test_omny_tomo_params_widget_math.py @@ -196,11 +196,17 @@ def test_irrelevant_params_for_type_keeps_zero_deg_reference_for_omny_types_4_an """_irrelevant_params_for_type() used to hardcode `tomo_type != 1`, which would hide zero_deg_reference_at_each_subtomo from an OMNY type-4/5 job's tooltip even though it's a real, applicable setting for those types too - (only flomni/lamni are limited to type 1) -- fixed to `not in (1, 4, 5)`.""" + (only flomni/lamni are limited to type 1) -- the sub-tomogram types now + come from the omny profile's "tomo_types".""" + profile = SETUP_PROFILES["omny"] for tomo_type in (1, 4, 5): - assert "zero_deg_reference_at_each_subtomo" not in _irrelevant_params_for_type(tomo_type) + assert "zero_deg_reference_at_each_subtomo" not in _irrelevant_params_for_type( + tomo_type, profile + ) for tomo_type in (2, 3): - assert "zero_deg_reference_at_each_subtomo" in _irrelevant_params_for_type(tomo_type) + assert "zero_deg_reference_at_each_subtomo" in _irrelevant_params_for_type( + tomo_type, profile + ) # --- _validate()'s tomo_type check: regression guard for the critical fix -- diff --git a/tests/tests_bec_ipython_client/test_omny_tomo_queue.py b/tests/tests_bec_ipython_client/test_omny_tomo_queue.py index 11284244..94dce0dd 100644 --- a/tests/tests_bec_ipython_client/test_omny_tomo_queue.py +++ b/tests/tests_bec_ipython_client/test_omny_tomo_queue.py @@ -139,7 +139,7 @@ def test_tomo_queue_execute_resumes_incomplete_job(): omny.tomo_queue_execute() - assert calls == [("resume", (), {})] + assert calls == [("resume", (), {"from_queue": True})] job = omny._tomo_queue_proxy.as_list()[0] assert job["status"] == "done" diff --git a/tests/tests_bec_ipython_client/test_omny_tomo_scan.py b/tests/tests_bec_ipython_client/test_omny_tomo_scan.py index 15213c57..380c0e9a 100644 --- a/tests/tests_bec_ipython_client/test_omny_tomo_scan.py +++ b/tests/tests_bec_ipython_client/test_omny_tomo_scan.py @@ -525,6 +525,7 @@ def test_write_to_scilog_tolerates_send_exception(monkeypatch): def test_write_tomo_scan_number_creates_missing_directory(monkeypatch, tmp_path): monkeypatch.setenv("HOME", str(tmp_path)) omny = object.__new__(OMNY) + omny.client = FakeGlobalVarClient() omny.tomo_id = 1 fake_dev = types.SimpleNamespace( osamroy=types.SimpleNamespace(read=lambda: {"osamroy": {"value": 12.5}}),