Allow for blank enum names from binary records (#152)

* Allow for blank enum names from binary records * Remove duplicate record
bluesky · Mar 14, 2024 · fd6b8ab · fd6b8ab
1 parent e19e8d2
commit fd6b8ab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/ophyd_async/epics/_backend/common.py b/src/ophyd_async/epics/_backend/common.py
@@ -16,5 +16,5 @@ def get_supported_enum_class(
         if set(choices).difference(pv_choices):
             raise TypeError(f"{pv} has choices {pv_choices}: not all in {choices}")
     return Enum(
-        "GeneratedChoices", {x: x for x in pv_choices}, type=str
+        "GeneratedChoices", {x or "_": x for x in pv_choices}, type=str
     )  # type: ignore
diff --git a/tests/epics/test_records.db b/tests/epics/test_records.db
@@ -5,6 +5,11 @@ record(bo, "$(P)bool") {
   field(PINI, "YES")
 }
 
+record(bo, "$(P)bool_unnamed") {
+  field(VAL, "1")
+  field(PINI, "YES")
+}
+
 record(longout, "$(P)int") {
   field(HOPR, "100")
   field(HIHI, "98")

diff --git a/tests/epics/test_signals.py b/tests/epics/test_signals.py
@@ -246,10 +246,11 @@ async def test_backend_get_put_monitor(
     assert np.all(loaded[0]["test"] == put_value)
 
 
-async def test_bool_conversion_of_enum(ioc: IOC) -> None:
+@pytest.mark.parametrize("suffix", ["bool", "bool_unnamed"])
+async def test_bool_conversion_of_enum(ioc: IOC, suffix: str) -> None:
     await assert_monitor_then_put(
         ioc,
-        suffix="bool",
+        suffix=suffix,
         descriptor=integer_d(True),
         initial_value=True,
         put_value=False,