Fixup tests for ophyd-async flux, slits

DiamondLightSource · Jan 28, 2025 · 33b17f6 · 33b17f6
1 parent 2d7f414
commit 33b17f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -46,7 +46,7 @@ dependencies = [
     "ophyd == 1.9.0",
     "ophyd-async >= 0.8a5",
     "bluesky >= 1.13",
-    "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@cb12746cb3f658a6d4571a0cd870133a17980bb7",
+    "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@44f5ee68f902118efa0d2efcef39b490b87fe0a1",
 ]
 
 

diff --git a/src/mx_bluesky/hyperion/utils/validation.py b/src/mx_bluesky/hyperion/utils/validation.py
@@ -86,13 +86,13 @@ def fake_create_rotation_devices():
     detector_motion = i03.detector_motion(connect_immediately=True, mock=True)
     backlight = i03.backlight(mock=True)
     attenuator = i03.attenuator(connect_immediately=True, mock=True)
-    flux = i03.flux(fake_with_ophyd_sim=True)
+    flux = i03.flux(connect_immediately=True, mock=True)
     undulator = i03.undulator(connect_immediately=True, mock=True)
     aperture_scatterguard = i03.aperture_scatterguard(
         connect_immediately=True, mock=True
     )
     synchrotron = i03.synchrotron(connect_immediately=True, mock=True)
-    s4_slit_gaps = i03.s4_slit_gaps(fake_with_ophyd_sim=True)
+    s4_slit_gaps = i03.s4_slit_gaps(connect_immediately=True, mock=True)
     dcm = i03.dcm(connect_immediately=True, mock=True)
     robot = i03.robot(connect_immediately=True, mock=True)
     oav = i03.oav(

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -371,7 +371,7 @@ def undulator():
 
 @pytest.fixture
 def s4_slit_gaps():
-    return i03.s4_slit_gaps(fake_with_ophyd_sim=True)
+    return i03.s4_slit_gaps(connect_immediately=True, mock=True)
 
 
 @pytest.fixture
@@ -406,7 +406,7 @@ def oav(test_config_files, RE):
 
 @pytest.fixture
 def flux():
-    return i03.flux(fake_with_ophyd_sim=True)
+    return i03.flux(connect_immediately=True, mock=True)
 
 
 @pytest.fixture
@@ -816,8 +816,8 @@ async def fake_fgs_composite(
         zebra_fast_grid_scan=i03.zebra_fast_grid_scan(
             connect_immediately=True, mock=True
         ),
-        flux=i03.flux(fake_with_ophyd_sim=True),
-        s4_slit_gaps=i03.s4_slit_gaps(fake_with_ophyd_sim=True),
+        flux=i03.flux(connect_immediately=True, mock=True),
+        s4_slit_gaps=i03.s4_slit_gaps(connect_immediately=True, mock=True),
         smargon=smargon,
         undulator=i03.undulator(connect_immediately=True, mock=True),
         synchrotron=synchrotron,