Made set_and_wait_for_other_value still still raise a TimeoutError if there is no __name__ on the matcher (#1123)

* Made set_and_wait_for_other_value still still raise a TimeoutError if there is no __name__ on the matcher

* Additions from review

Author: DominicOram

src/ophyd_async/core/_signal.py

@@ -639,9 +639,10 @@ async def _wait_for_value():
             if wait_for_set_completion:
                 await status
         except TimeoutError as exc:
+            matcher_name = getattr(matcher, "__name__", f"<{type(matcher).__name__}>")
             raise TimeoutError(
                 f"{match_signal.name} value didn't match value from"
-                f" {matcher.__name__}() in {timeout}s"
+                f" {matcher_name}() in {timeout}s"
             ) from exc
 
     return status

tests/unit_tests/core/test_signal.py

@@ -3,6 +3,7 @@
 import re
 import time
 from asyncio import Event
+from functools import partial
 from typing import Any
 from unittest.mock import ANY, AsyncMock, MagicMock, Mock, call
 
@@ -334,6 +335,36 @@ def _equals_x(value, x):
         )
 
 
+async def test_given_callable_has_no_name_then_matcher_still_gives_timeout_error():
+    set_signal = epics_signal_rw(int, "pva://signal")
+    match_signal = epics_signal_rw(int, "pva://match_signal")
+
+    await set_signal.connect(mock=True)
+    await match_signal.connect(mock=True)
+
+    class NoNameCallable:
+        def __call__(self, val):
+            return val == 20
+
+    with pytest.raises(asyncio.TimeoutError):
+        await set_and_wait_for_other_value(
+            set_signal, 20, match_signal, NoNameCallable(), timeout=0.01
+        )
+
+
+async def test_partial_matcher_still_gives_timeout_error():
+    set_signal = epics_signal_rw(int, "pva://signal")
+    match_signal = epics_signal_rw(int, "pva://match_signal")
+
+    await set_signal.connect(mock=True)
+    await match_signal.connect(mock=True)
+
+    with pytest.raises(asyncio.TimeoutError):
+        await set_and_wait_for_other_value(
+            set_signal, 20, match_signal, partial(lambda x, y: x == y, 20), timeout=0.01
+        )
+
+
 async def test_wait_for_value_with_value():
     signal = epics_signal_rw(str, read_pv="pva://signal", name="signal")
     await signal.connect(mock=True)