From 0da52c905d56be983d15713c688f7c7c76248b34 Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Mon, 5 Aug 2024 15:16:56 +0100 Subject: [PATCH] Move plan into a plans stubs folder --- src/mx_bluesky/{plans/level_1 => plan_stubs}/do_fgs.py | 0 tests/{plans/level_1 => plan_stubs}/test_do_fgs.py | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/mx_bluesky/{plans/level_1 => plan_stubs}/do_fgs.py (100%) rename tests/{plans/level_1 => plan_stubs}/test_do_fgs.py (89%) diff --git a/src/mx_bluesky/plans/level_1/do_fgs.py b/src/mx_bluesky/plan_stubs/do_fgs.py similarity index 100% rename from src/mx_bluesky/plans/level_1/do_fgs.py rename to src/mx_bluesky/plan_stubs/do_fgs.py diff --git a/tests/plans/level_1/test_do_fgs.py b/tests/plan_stubs/test_do_fgs.py similarity index 89% rename from tests/plans/level_1/test_do_fgs.py rename to tests/plan_stubs/test_do_fgs.py index cbe3451bf..bba60e6ae 100644 --- a/tests/plans/level_1/test_do_fgs.py +++ b/tests/plan_stubs/test_do_fgs.py @@ -10,7 +10,7 @@ from dodal.devices.synchrotron import Synchrotron, SynchrotronMode from ophyd_async.core import DeviceCollector, set_mock_value -from mx_bluesky.plans.level_1.do_fgs import do_fgs +from mx_bluesky.plan_stubs.do_fgs import do_fgs @pytest.fixture @@ -40,7 +40,7 @@ def null_plan(): fgs_device = fgs_devices["grid_scan_device"] post_plan = MagicMock(side_effect=null_plan) pre_plan = MagicMock(side_effect=null_plan) - with patch("mx_bluesky.plans.level_1.do_fgs.check_topup_and_wait_if_necessary"): + with patch("mx_bluesky.plan_stubs.do_fgs.check_topup_and_wait_if_necessary"): msgs = sim_run_engine.simulate_plan( do_fgs( fgs_device, @@ -52,7 +52,7 @@ def null_plan(): ) null_messages = [msg for msg in msgs if msg.command == "null"] assert len(null_messages) == 2 - with patch("mx_bluesky.plans.level_1.do_fgs.check_topup_and_wait_if_necessary"): + with patch("mx_bluesky.plan_stubs.do_fgs.check_topup_and_wait_if_necessary"): msgs = sim_run_engine.simulate_plan( do_fgs( fgs_device, @@ -77,5 +77,5 @@ def do_fgs_plan_in_run(): set_mock_value(fgs_device.status, 1) - with patch("mx_bluesky.plans.level_1.do_fgs.bps.complete"): + with patch("mx_bluesky.plan_stubs.do_fgs.bps.complete"): RE(do_fgs_plan_in_run())