Update on_update to be blocking by default

Improve pva test

Author: GDYendell

src/fastcs/transports/epics/ca/ioc.py

@@ -193,7 +193,11 @@ def _make_record(
     )
     attribute_record_metadata = record_metadata_from_attribute(attribute)
 
-    update = {"always_update": True, "on_update": on_update} if on_update else {}
+    update = (
+        {"on_update": on_update, "always_update": True, "blocking": True}
+        if on_update
+        else {}
+    )
 
     record = builder_callable(
         pv, **update, **datatype_record_metadata, **attribute_record_metadata

tests/transports/epics/ca/test_softioc.py

@@ -187,7 +187,7 @@ def test_make_output_record(
 
     kwargs.update(record_metadata_from_datatype(attribute.datatype, out_record=True))
     kwargs.update(record_metadata_from_attribute(attribute))
-    kwargs.update({"always_update": True, "on_update": update})
+    kwargs.update({"always_update": True, "on_update": update, "blocking": True})
 
     getattr(builder, record_type).assert_called_once_with(
         pv,
@@ -265,6 +265,7 @@ def test_ioc(mocker: MockerFixture, epics_controller_api: ControllerAPI):
     builder.aOut.assert_any_call(
         f"{DEVICE}:ReadWriteFloat",
         always_update=True,
+        blocking=True,
         on_update=mocker.ANY,
         **record_metadata_from_attribute(
             epics_controller_api.attributes["read_write_float"]
@@ -286,6 +287,7 @@ def test_ioc(mocker: MockerFixture, epics_controller_api: ControllerAPI):
     builder.longOut.assert_called_with(
         f"{DEVICE}:ReadWriteInt",
         always_update=True,
+        blocking=True,
         on_update=mocker.ANY,
         **record_metadata_from_attribute(
             epics_controller_api.attributes["read_write_int"]
@@ -304,6 +306,7 @@ def test_ioc(mocker: MockerFixture, epics_controller_api: ControllerAPI):
     builder.mbbOut.assert_called_once_with(
         f"{DEVICE}:Enum",
         always_update=True,
+        blocking=True,
         on_update=mocker.ANY,
         **record_metadata_from_attribute(epics_controller_api.attributes["enum"]),
         **record_metadata_from_datatype(
@@ -313,6 +316,7 @@ def test_ioc(mocker: MockerFixture, epics_controller_api: ControllerAPI):
     builder.boolOut.assert_called_once_with(
         f"{DEVICE}:WriteBool",
         always_update=True,
+        blocking=True,
         on_update=mocker.ANY,
         **record_metadata_from_attribute(epics_controller_api.attributes["write_bool"]),
         **record_metadata_from_datatype(
@@ -460,6 +464,7 @@ def test_long_pv_names_discarded(mocker: MockerFixture):
     builder.longOut.assert_called_once_with(
         f"{DEVICE}:{short_pv_name}",
         always_update=True,
+        blocking=True,
         on_update=mocker.ANY,
         **record_metadata_from_datatype(
             long_name_controller_api.attributes["attr_rw_short_name"].datatype,
@@ -500,6 +505,7 @@ def test_long_pv_names_discarded(mocker: MockerFixture):
         builder.longOut.assert_called_once_with(
             f"{DEVICE}:{long_rw_pv_name}",
             always_update=True,
+            blocking=True,
             on_update=mocker.ANY,
         )
     with pytest.raises(AssertionError):

tests/transports/epics/pva/test_p4p.py

@@ -394,7 +394,8 @@ class SomeController(Controller):
         }
 
 
-def test_more_exotic_datatypes():
+@pytest.mark.asyncio
+async def test_more_exotic_datatypes():
     table_columns: list[tuple[str, DTypeLike]] = [
         ("A", "i"),
         ("B", "i"),
@@ -439,7 +440,6 @@ class SomeController(Controller):
     client_put_enum_value = "C"
 
     async def _wait_and_set_attrs():
-        await asyncio.sleep(0.1)
         # This demonstrates an update from hardware,
         # resulting in only a change in the read back.
         await asyncio.gather(
@@ -449,7 +449,6 @@ async def _wait_and_set_attrs():
         )
 
     async def _wait_and_put_pvs():
-        await asyncio.sleep(0.3)
         ctxt = Context("pva")
         # This demonstrates a client put,
         # resulting in a change in the demand and read back.
@@ -471,72 +470,62 @@ async def _wait_and_put_pvs():
         enum_values.append,
     )
 
-    serve = asyncio.ensure_future(fastcs.serve(interactive=False))
-    wait_and_set_attrs = asyncio.ensure_future(_wait_and_set_attrs())
-    wait_and_put_pvs = asyncio.ensure_future(_wait_and_put_pvs())
-    try:
-        asyncio.get_event_loop().run_until_complete(
-            asyncio.wait_for(
-                asyncio.gather(serve, wait_and_set_attrs, wait_and_put_pvs),
-                timeout=0.6,
-            )
-        )
-    except TimeoutError:
-        ...
-    finally:
-        waveform_monitor.close()
-        table_monitor.close()
-        enum_monitor.close()
-        serve.cancel()
-        wait_and_set_attrs.cancel()
-        wait_and_put_pvs.cancel()
+    serve = asyncio.create_task(fastcs.serve(interactive=False))
+    await asyncio.sleep(0.1)  # Wait for task to start
 
-        expected_waveform_gets = [
-            initial_waveform_value,
-            server_set_waveform_value,
-            client_put_waveform_value,
-        ]
+    await _wait_and_set_attrs()
+    await _wait_and_put_pvs()
+    await asyncio.sleep(0.1)  # Wait for monitors to return
 
-        for expected_waveform, actual_waveform in zip(
-            expected_waveform_gets, waveform_values, strict=True
-        ):
-            np.testing.assert_array_equal(
-                expected_waveform, actual_waveform.todict()["value"].reshape(10, 10)
-            )
+    waveform_monitor.close()
+    table_monitor.close()
+    enum_monitor.close()
+    serve.cancel()
 
-        expected_table_gets = [
-            NTTable(columns=table_columns).wrap(initial_table_value),
-            NTTable(columns=table_columns).wrap(server_set_table_value),
-            client_put_table_value,
-        ]
-        for expected_table, actual_table in zip(
-            expected_table_gets, table_values, strict=True
-        ):
-            expected_table = expected_table.todict()["value"]
-            actual_table = actual_table.todict()["value"]
-            for expected_column, actual_column in zip(
-                expected_table.values(), actual_table.values(), strict=True
-            ):
-                if isinstance(expected_column, np.ndarray):
-                    np.testing.assert_array_equal(expected_column, actual_column)
-                else:
-                    assert expected_column == actual_column and actual_column is None
-
-        expected_enum_gets = [
-            initial_enum_value,
-            server_set_enum_value,
-            AnEnum.C,
-        ]
+    expected_waveform_gets = [
+        initial_waveform_value,
+        server_set_waveform_value,
+        client_put_waveform_value,
+    ]
+
+    for expected_waveform, actual_waveform in zip(
+        expected_waveform_gets, waveform_values, strict=True
+    ):
+        np.testing.assert_array_equal(
+            expected_waveform, actual_waveform.todict()["value"].reshape(10, 10)
+        )
 
-        for expected_enum, actual_enum in zip(
-            expected_enum_gets, enum_values, strict=True
+    expected_table_gets = [
+        NTTable(columns=table_columns).wrap(initial_table_value),
+        NTTable(columns=table_columns).wrap(server_set_table_value),
+        client_put_table_value,
+    ]
+    for expected_table, actual_table in zip(
+        expected_table_gets, table_values, strict=True
+    ):
+        expected_table = expected_table.todict()["value"]
+        actual_table = actual_table.todict()["value"]
+        for expected_column, actual_column in zip(
+            expected_table.values(), actual_table.values(), strict=True
         ):
-            assert (
-                expected_enum
-                == controller.some_enum.datatype.members[  # type: ignore
-                    actual_enum.todict()["value"]["index"]
-                ]
-            )
+            if isinstance(expected_column, np.ndarray):
+                np.testing.assert_array_equal(expected_column, actual_column)
+            else:
+                assert expected_column == actual_column and actual_column is None
+
+    expected_enum_gets = [
+        initial_enum_value,
+        server_set_enum_value,
+        AnEnum.C,
+    ]
+
+    for expected_enum, actual_enum in zip(expected_enum_gets, enum_values, strict=True):
+        assert (
+            expected_enum
+            == controller.some_enum.datatype.members[  # type: ignore
+                actual_enum.todict()["value"]["index"]
+            ]
+        )
 
 
 @pytest.mark.timeout(4)