#818 fix fgs plan system tests

.vscode/hyperion-dodal-nexgen.code-workspace

@@ -16,7 +16,7 @@
 		"esbonio.sphinx.confDir": "",
 		"search.useIgnoreFiles": false,
 		"[python]": {
-			"editor.defaultFormatter": "ms-python.black-formatter"
+			"editor.defaultFormatter": "charliermarsh.ruff"
 		},
 		"python.formatting.provider": "none"
 	}

.vscode/settings.json

@@ -13,7 +13,7 @@
             "source.fixAll.ruff": "explicit",
             "source.organizeImports.ruff": "explicit"
         },
-        "editor.defaultFormatter": "ms-python.black-formatter"
+        "editor.defaultFormatter": "charliermarsh.ruff"
     },
     "terminal.integrated.gpuAcceleration": "off",
     "python.analysis.typeCheckingMode": "basic",

conftest.py

@@ -1,8 +1,19 @@
+from os import environ, getenv
 from typing import Iterator
 from unittest.mock import patch
 
 import pytest
 
+print("Adjusting S03 EPICS environment ...")
+s03_epics_server_port = getenv("S03_EPICS_CA_SERVER_PORT")
+s03_epics_repeater_port = getenv("S03_EPICS_CA_REPEATER_PORT")
+if s03_epics_server_port:
+    environ["EPICS_CA_SERVER_PORT"] = s03_epics_server_port
+    print(f"[EPICS_CA_SERVER_PORT] = {s03_epics_server_port}")
+if s03_epics_repeater_port:
+    environ["EPICS_CA_REPEATER_PORT"] = s03_epics_repeater_port
+    print(f"[EPICS_CA_REPEATER_PORT] = {s03_epics_repeater_port}")
+
 
 def pytest_addoption(parser):
     parser.addoption(

setup.cfg

@@ -35,7 +35,7 @@ install_requires =
     xarray
     doct
     databroker
-    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@ca9d6df8f17f88ce0128af9cbdfd40d0cfc44a26
+    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@97e3cdc11b1b5092c7f12ab6bc5ea1d702401b68
     pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774
     scipy
     pyzmq<25 # See https://github.com/DiamondLightSource/hyperion/issues/1103

src/hyperion/experiment_plans/flyscan_xray_centre_plan.py

@@ -246,7 +246,7 @@ def run_gridscan(
 
     LOGGER.info("Setting fgs params")
     yield from set_flyscan_params(fgs_motors, parameters.experiment_params)
-
+    LOGGER.info("Waiting for gridscan validity check")
     yield from wait_for_gridscan_valid(fgs_motors)
 
     LOGGER.info("Waiting for arming to finish")

tests/conftest.py

@@ -1,7 +1,6 @@
 import sys
 import threading
 from functools import partial
-from os import environ, getenv
 from typing import Callable, Generator, Optional, Sequence
 from unittest.mock import MagicMock, patch
 
@@ -116,23 +115,6 @@ def pytest_runtest_setup(item):
         print("Skipping log setup for log test - deleting existing handlers")
         _destroy_loggers([*ALL_LOGGERS, dodal_logger])
 
-    if "s03" in markers:
-        print("Running s03 test - setting EPICS server ports variables...")
-        s03_epics_server_port = getenv("S03_EPICS_CA_SERVER_PORT")
-        s03_epics_repeater_port = getenv("S03_EPICS_CA_REPEATER_PORT")
-
-        assert (
-            s03_epics_server_port is not None and s03_epics_repeater_port is not None
-        ), (
-            "Please run the S03 launch script with the '-f' flag to run it on a port "
-            " which doesn't clash with the real EPICS ports."
-        )
-
-        environ["EPICS_CA_SERVER_PORT"] = s03_epics_server_port
-        print(f"[EPICS_CA_SERVER_PORT] = {s03_epics_server_port}")
-        environ["EPICS_CA_REPEATER_PORT"] = s03_epics_repeater_port
-        print(f"[EPICS_CA_REPEATER_PORT] = {s03_epics_repeater_port}")
-
 
 def pytest_runtest_teardown():
     if "dodal.beamlines.beamline_utils" in sys.modules: