TST: fixed the 'ioc' fixture and the test

Author: dmgav

tests/common.py

@@ -1,4 +1,5 @@
 import pytest
+from epics import caget, caput
 
 from save_and_restore_api import SaveRestoreAPI
 
@@ -110,25 +111,30 @@ def _clear():
     _clear()
 
 
+ioc_pvs = {
+    "simulated:A": 1.0,
+    "simulated:B": 2.0,
+    "simulated:C": 3.0,
+    "simulated:D": 4.0,
+    "simulated:E": 5.0,
+    "simulated:F": 6.0,
+    "simulated:G": 7.0,
+    "simulated:H": 8.0,
+    "simulated:I": 9.0,
+    "simulated:J": 10.0,
+}
+
+
 @pytest.fixture
 def ioc():
     """
     Reset simulated IOC to initial values before and after the test
     """
 
     def _reset_ioc():
-        from epics import caput
-
-        caput("simulated:A", 1.0)
-        caput("simulated:B", 2.0)
-        caput("simulated:C", 3.0)
-        caput("simulated:D", 4.0)
-        caput("simulated:E", 5.0)
-        caput("simulated:F", 6.0)
-        caput("simulated:G", 7.0)
-        caput("simulated:H", 8.0)
-        caput("simulated:I", 9.0)
-        caput("simulated:J", 10.0)
+        for pv, val in ioc_pvs.items():
+            caget(pv)
+            caput(pv, val)
 
     _reset_ioc()
     yield

tests/test_misc.py

@@ -4,6 +4,7 @@
 import importlib.metadata
 
 import pytest
+from epics import caget
 
 import save_and_restore_api
 from save_and_restore_api import SaveRestoreAPI as SaveRestoreAPI_Threads
@@ -16,6 +17,7 @@
     base_url,
     clear_sar,  # noqa: F401
     ioc,  # noqa: F401
+    ioc_pvs,
     read_password,
     read_username,
     user_password,
@@ -105,14 +107,5 @@ async def testing():
 
 
 def test_epics(ioc):   # noqa: F811
-    import epics
-    assert epics.caget("simulated:A") == 1.0
-    assert epics.caget("simulated:B") == 2.0
-    assert epics.caget("simulated:C") == 3.0
-    assert epics.caget("simulated:D") == 4.0
-    assert epics.caget("simulated:E") == 5.0
-    assert epics.caget("simulated:F") == 6.0
-    assert epics.caget("simulated:G") == 7.0
-    assert epics.caget("simulated:H") == 8.0
-    assert epics.caget("simulated:I") == 9.0
-    assert epics.caget("simulated:J") == 10.0
+    for pv, value in ioc_pvs.items():
+        assert caget(pv) == value, f"PV {pv} has value {caget(pv)}, expected {value}"