Merge pull request #25 from dls-controls/improve_coverage

Improve coverage

Author: coretl

tests/sim_asyncio_ioc.py

@@ -4,7 +4,7 @@
 import time
 import sys
 
-from softioc import softioc, builder, asyncio_dispatcher, pvlog
+from softioc import alarm, softioc, builder, asyncio_dispatcher, pvlog
 
 
 if __name__ == "__main__":
@@ -17,13 +17,20 @@
     import sim_records
 
     async def callback(value):
+        # Set the ao value, which will trigger on_update for it
+        sim_records.t_ao.set(value)
         await asyncio.sleep(0.5)
-        print("async update %s" % value)
+        print("async update %s (%s)" % (value, sim_records.t_ai.get()))
         # Make sure it goes as epicsExit will not flush this for us
         sys.stdout.flush()
-        sim_records.t_ai.set(value)
+        # Set the ai alarm, but keep the value
+        sim_records.t_ai.set_alarm(int(value) % 4, alarm.STATE_ALARM)
 
-    t_ao = builder.aOut('AO2', on_update=callback)
+    # Set a different initial value
+    sim_records.t_ai.set(23.45)
+
+    # Create a record to set the alarm
+    t_ao = builder.aOut('ALARM', on_update=callback)
 
     # Run the IOC
     builder.LoadDatabase()

tests/sim_records.py

@@ -35,7 +35,7 @@ def on_update_name(value, name):
 t_stringout = stringOut(
     'STRINGOUT', initial_value='watevah', on_update=on_update)
 t_mbbo = mbbOut(
-    'MBBO', 'Ein', 'Zwei', 'Drei', initial_value=1, on_update=on_update)
+    'MBBO', 'Ein', 'Zwei', 'Drei', initial_value=1)
 
 def update_sin_wf(value):
     print('update_sin_wf', value)

tests/test_asyncio.py

@@ -7,6 +7,7 @@
 import os
 import atexit
 import pytest
+import time
 
 PV_PREFIX = "".join(random.choice(string.ascii_uppercase) for _ in range(12))
 
@@ -33,7 +34,7 @@ def asyncio_ioc():
 @pytest.mark.asyncio
 async def test_asyncio_ioc(asyncio_ioc):
     import asyncio
-    from aioca import caget, caput, camonitor, CANothing, _catools, FORMAT_CTRL
+    from aioca import caget, caput, camonitor, CANothing, _catools, FORMAT_TIME
     # Unregister the aioca atexit handler as it conflicts with the one installed
     # by cothread. If we don't do this we get a seg fault. This is not a problem
     # in production as we won't mix aioca and cothread, but we do mix them in
@@ -48,19 +49,25 @@ async def test_asyncio_ioc(asyncio_ioc):
     m = camonitor(PV_PREFIX + ":SIN", q.put, notify_disconnect=True)
     assert len(await asyncio.wait_for(q.get(), 1)) == 4
     # AO
-    ao_val = await caget(PV_PREFIX + ":AO2", format=FORMAT_CTRL)
+    ao_val = await caget(PV_PREFIX + ":ALARM", format=FORMAT_TIME)
     assert ao_val == 0
     assert ao_val.severity == 3  # INVALID
     assert ao_val.status == 17  # UDF
-    await caput(PV_PREFIX + ":AO2", 3.56, wait=True)
+    await caput(PV_PREFIX + ":ALARM", 3, wait=True)
     await asyncio.sleep(0.1)
-    assert await caget(PV_PREFIX + ":AI") == 12.34
+    ai_val = await caget(PV_PREFIX + ":AI", format=FORMAT_TIME)
+    assert ai_val == 23.45
+    assert ai_val.severity == 0
+    assert ai_val.status == 0
     await asyncio.sleep(0.8)
-    assert await caget(PV_PREFIX + ":AI") == 3.56
+    ai_val = await caget(PV_PREFIX + ":AI", format=FORMAT_TIME)
+    assert ai_val == 23.45
+    assert ai_val.severity == 3
+    assert ai_val.status == 7  # STATE_ALARM
     # Check pvaccess works
     from p4p.client.asyncio import Context
     with Context("pva") as ctx:
-        assert await ctx.get(PV_PREFIX + ":AI") == 3.56
+        assert await ctx.get(PV_PREFIX + ":AI") == 23.45
     # Wait for a bit longer for the print output to flush
     await asyncio.sleep(2)
     # Stop
@@ -73,8 +80,9 @@ async def test_asyncio_ioc(asyncio_ioc):
     # check closed and output
     assert "%s:SINN.VAL 1024 -> 4" % PV_PREFIX in out
     assert 'update_sin_wf 4' in out
-    assert "%s:AO2.VAL 0 -> 3.56" % PV_PREFIX in out
-    assert 'async update 3.56' in out
+    assert "%s:ALARM.VAL 0 -> 3" % PV_PREFIX in out
+    assert 'on_update %s:AO : 3.0' % PV_PREFIX in out
+    assert 'async update 3.0 (23.45)' in out
     assert 'Starting iocInit' in err
     assert 'iocRun: All initialization complete' in err
     assert '(InteractiveConsole)' in err