Moved the remaining tests out of tests/ and skipped the simulated IOC…

… tests.
spc-group · Nov 10, 2023 · 7d94cfc · 7d94cfc
1 parent 8d66aae
commit 7d94cfc
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 17 deletions.
diff --git a/tests/test_align_motor.py → src/haven/tests/test_align_motor.py b/tests/test_align_motor.py → src/haven/tests/test_align_motor.py
diff --git a/tests/test_beam_properties.py → src/haven/tests/test_beam_properties.py b/tests/test_beam_properties.py → src/haven/tests/test_beam_properties.py
diff --git a/tests/test_camera.py → src/haven/tests/test_camera.py b/tests/test_camera.py → src/haven/tests/test_camera.py
diff --git a/tests/test_iconfig.py → src/haven/tests/test_iconfig.py b/tests/test_iconfig.py → src/haven/tests/test_iconfig.py
diff --git a/tests/test_iconfig.toml → src/haven/tests/test_iconfig.toml b/tests/test_iconfig.toml → src/haven/tests/test_iconfig.toml
diff --git a/tests/test_instrument_registry.py → src/haven/tests/test_instrument_registry.py b/tests/test_instrument_registry.py → src/haven/tests/test_instrument_registry.py
diff --git a/tests/test_mono_ID_calibration_plan.py → ...en/tests/test_mono_ID_calibration_plan.py b/tests/test_mono_ID_calibration_plan.py → ...en/tests/test_mono_ID_calibration_plan.py
diff --git a/tests/test_plans.py → src/haven/tests/test_plans.py b/tests/test_plans.py → src/haven/tests/test_plans.py
diff --git a/tests/test_run_engine.py → src/haven/tests/test_run_engine.py b/tests/test_run_engine.py → src/haven/tests/test_run_engine.py
diff --git a/tests/test_save_motor_positions.py → src/haven/tests/test_save_motor_positions.py b/tests/test_save_motor_positions.py → src/haven/tests/test_save_motor_positions.py
@@ -7,7 +7,6 @@
 import datetime as dt
 from datetime import datetime
 
-import epics
 import pytest
 from ophyd.sim import motor1, SynAxis, make_fake_device
 from ophyd import EpicsMotor, Signal, Component as Cpt
@@ -165,33 +164,27 @@ def test_list_motor_positions(mongodb, capsys):
     assert captured.out == expected
 
 
-def test_motor_position_e2e(mongodb, ioc_motor):
+def test_motor_position_e2e(mongodb, sim_motor_registry):
     """Check that a motor position can be saved, then recalled using
-    simulated IOC.
+    a simulated motor.
 
     """
     # Create an epics motor for setting values manually
-    pv = ioc_motor.pvs["m1"]
-    motor1 = EpicsMotor(pv, name="SLT V Upper")
-    motor1.wait_for_connection(timeout=20)
-    assert motor1.connected
-    registry.register(motor1)
-    registry.find(name="SLT V Upper")
-    epics.caput(pv, 504.6)
-    assert epics.caget(pv, use_monitor=False) == 504.6
-    time.sleep(0.1)
-    assert motor1.get(use_monitor=False).user_readback == 504.6
+    motor1 = sim_motor_registry.find(name="SLT V Upper")
+    # Set a fake value
+    motor1.set(504.6).wait(timeout=2)
+    # assert epics.caget(pv, use_monitor=False) == 504.6
+    # time.sleep(0.1)
+    assert motor1.get().readback == 504.6
     # Save motor position
     uid = save_motor_position(
         motor1,
         name="starting point",
         collection=mongodb.motor_positions,
     )
     # Change to a different value
-    epics.caput(pv, 520)
-    time.sleep(0.1)
-    assert epics.caget(pv, use_monitor=False) == 520
-    assert motor1.get(use_monitor=False).user_readback == 520
+    motor1.set(520).wait(timeout=2)
+    assert motor1.get().readback == 520
     # Recall the saved position and see if it complies
     plan = recall_motor_position(uid=uid, collection=mongodb.motor_positions)
     msg = next(plan)

diff --git a/tests/test_scaler_triggering.py → src/haven/tests/test_scaler_triggering.py b/tests/test_scaler_triggering.py → src/haven/tests/test_scaler_triggering.py
diff --git a/tests/test_xdi_writer.py → src/haven/tests/test_xdi_writer.py b/tests/test_xdi_writer.py → src/haven/tests/test_xdi_writer.py
diff --git a/tests/run_engine.py b/tests/run_engine.py
diff --git a/tests/test_simulated_ioc.py b/tests/test_simulated_ioc.py
@@ -15,6 +15,9 @@
 ioc_dir = Path(__file__).parent.resolve() / "iocs"
 
 
+pytest.skip(allow_module_level=True)
+
+
 def test_simulated_ioc(ioc_simple):
     assert caget(ioc_simple.pvs["B"], use_monitor=False) == 2.0
     caput(ioc_simple.pvs["B"], 5)