Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

Get feature flags from config service #1444

Merged
merged 16 commits into from
Jun 26, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix tests
  • Loading branch information
d-perl committed Jun 26, 2024
commit 3c51430b8bd09e1cacefe025a6bd67789531de3e
Original file line number Diff line number Diff line change
@@ -42,7 +42,6 @@
set_aperture_for_bbox_size,
wait_for_gridscan_valid,
)
from hyperion.external_interaction.config_server import FeatureFlags
from hyperion.log import LOGGER
from hyperion.parameters.constants import CONST
from hyperion.parameters.gridscan import ThreeDGridScan
@@ -274,7 +273,7 @@ def panda_flyscan_xray_centre(

composite.eiger.set_detector_parameters(parameters.detector_params)
composite.zocalo.zocalo_environment = parameters.zocalo_environment
parameters.do_set_stub_offsets(FeatureFlags.best_effort().set_stub_offsets)
parameters.features.update_self_from_server()

@bpp.set_run_key_decorator(CONST.PLAN.GRIDSCAN_OUTER)
@bpp.run_decorator( # attach experiment metadata to the start document
Original file line number Diff line number Diff line change
@@ -421,7 +421,7 @@ def test_when_gridscan_finished_then_smargon_stub_offsets_are_set_and_dev_shm_di
fake_fgs_composite: FlyScanXRayCentreComposite,
):
RE, (nexus_cb, ispyb_cb) = RE_with_subs
test_fgs_params._set_stub_offsets = True
test_fgs_params.features.set_stub_offsets = True

fake_fgs_composite.eiger.odin.fan.dev_shm_enable.sim_put(1) # type: ignore

@@ -646,7 +646,7 @@ def test_given_setting_stub_offsets_disabled_then_stub_offsets_not_set(
fake_fgs_composite.aperture_scatterguard.set = MagicMock(
return_value=done_status
)
test_fgs_params._set_stub_offsets = False
test_fgs_params.features.set_stub_offsets = False

def wrapped_gridscan_and_move():
run_generic_ispyb_handler_setup(ispyb_cb, test_fgs_params)
Original file line number Diff line number Diff line change
@@ -386,7 +386,7 @@ def test_when_gridscan_finished_then_smargon_stub_offsets_are_set_and_dev_shm_di
test_panda_fgs_params: ThreeDGridScan,
fake_fgs_composite: FlyScanXRayCentreComposite,
):
test_panda_fgs_params._set_stub_offsets = True
test_panda_fgs_params.features.set_stub_offsets = True

fake_fgs_composite.eiger.odin.fan.dev_shm_enable.sim_put(1) # type: ignore

@@ -454,9 +454,7 @@ def wrapped_run_gridscan_and_move():
wrapped_run_gridscan_and_move(), test_panda_fgs_params
)
)
app_to_comment: MagicMock = mock_subscriptions[
1
].ispyb.append_to_comment # type:ignore
app_to_comment: MagicMock = mock_subscriptions[1].ispyb.append_to_comment # type:ignore
app_to_comment.assert_called()
call = app_to_comment.call_args_list[0]
assert "Crystal 1: Strength 999999" in call.args[1]
@@ -499,9 +497,7 @@ def wrapped_run_gridscan_and_move():
wrapped_run_gridscan_and_move(), test_panda_fgs_params
)
)
app_to_comment: MagicMock = mock_subscriptions[
1
].ispyb.append_to_comment # type:ignore
app_to_comment: MagicMock = mock_subscriptions[1].ispyb.append_to_comment # type:ignore
app_to_comment.assert_called()
call = app_to_comment.call_args_list[0]
assert "Zocalo found no crystals in this gridscan" in call.args[1]
@@ -628,7 +624,7 @@ def test_given_setting_stub_offsets_disabled_then_stub_offsets_not_set(
fake_fgs_composite.aperture_scatterguard.set = MagicMock(
return_value=done_status
)
test_panda_fgs_params._set_stub_offsets = False
test_panda_fgs_params.features.set_stub_offsets = False

RE.subscribe(VerbosePlanExecutionLoggingCallback())
RE.subscribe(ispyb_cb)