Rename soft_signal_r to soft_signal_r_and_backend

bluesky · Apr 16, 2024 · b02299f · b02299f
1 parent 4551237
commit b02299f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/ophyd_async/core/__init__.py b/src/ophyd_async/core/__init__.py
@@ -35,7 +35,7 @@
     set_sim_callback,
     set_sim_put_proceeds,
     set_sim_value,
-    soft_signal_r,
+    soft_signal_r_and_backend,
     soft_signal_rw,
     wait_for_value,
 )
@@ -69,7 +69,7 @@
     "SignalW",
     "SignalRW",
     "SignalX",
-    "soft_signal_r",
+    "soft_signal_r_and_backend",
     "soft_signal_rw",
     "observe_value",
     "set_and_wait_for_value",

diff --git a/src/ophyd_async/core/signal.py b/src/ophyd_async/core/signal.py
@@ -260,7 +260,7 @@ def soft_signal_rw(
     return SignalRW(SimSignalBackend(datatype, f"sim://{source_prefix}:{name}"))
 
 
-def soft_signal_r(
+def soft_signal_r_and_backend(
     datatype: Optional[Type[T]], name: str, source_prefix: str
 ) -> Tuple[SignalR[T], SimSignalBackend]:
     """Returns a tuple of a read-only Signal and its SimSignalBackend through

diff --git a/tests/core/test_signal.py b/tests/core/test_signal.py
@@ -12,7 +12,7 @@
     set_and_wait_for_value,
     set_sim_put_proceeds,
     set_sim_value,
-    soft_signal_r,
+    soft_signal_r_and_backend,
     soft_signal_rw,
     wait_for_value,
 )
@@ -126,12 +126,12 @@ async def test_set_and_wait_for_value():
 
 @pytest.mark.parametrize(
     "signal_method,signal_class",
-    [(soft_signal_r, SignalR), (soft_signal_rw, SignalRW)],
+    [(soft_signal_r_and_backend, SignalR), (soft_signal_rw, SignalRW)],
 )
 async def test_create_soft_signal(signal_method, signal_class):
     TEST_PREFIX = "TEST-PREFIX"
     SIGNAL_NAME = "SIGNAL"
-    if signal_method == soft_signal_r:
+    if signal_method == soft_signal_r_and_backend:
         signal, backend = signal_method(str, SIGNAL_NAME, TEST_PREFIX)
     elif signal_method == soft_signal_rw:
         signal = signal_method(str, SIGNAL_NAME, TEST_PREFIX)