From 35466de9209e9335cdde04078c313b6b698073b9 Mon Sep 17 00:00:00 2001
From: olliesilvester <oliver.silvester@diamond.ac.uk>
Date: Fri, 19 Apr 2024 11:43:14 +0000
Subject: [PATCH] Fix conflicts

---
 src/ophyd_async/epics/_backend/_p4p.py | 5 ++---
 tests/core/test_signal.py              | 6 +++++-
 tests/core/test_utils.py               | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/ophyd_async/epics/_backend/_p4p.py b/src/ophyd_async/epics/_backend/_p4p.py
index 586d4cce9b..e917c79863 100644
--- a/src/ophyd_async/epics/_backend/_p4p.py
+++ b/src/ophyd_async/epics/_backend/_p4p.py
@@ -238,9 +238,8 @@ def __init__(self, datatype: Optional[Type[T]], read_pv: str, write_pv: str):
         self.converter: PvaConverter = DisconnectedPvaConverter()
         self.subscription: Optional[Subscription] = None
 
-    @property
-    def source(self, name: str):
-        return f"pva://{self.read_pv}"
+    def source(self, name: str = "") -> str:
+        return f"ca://{self.read_pv}"
 
     @property
     def ctxt(self) -> Context:
diff --git a/tests/core/test_signal.py b/tests/core/test_signal.py
index 070e3009ca..8e8455fb55 100644
--- a/tests/core/test_signal.py
+++ b/tests/core/test_signal.py
@@ -48,6 +48,10 @@ def __init__(self, backend, timeout, name):
         super().__init__(backend, timeout, name)
         self._backend = AsyncMock()
 
+    @property
+    def source(self) -> str:
+        return "source"
+
     async def connect(self):
         pass
 
@@ -250,7 +254,7 @@ async def test_signal_connect_logs(caplog):
     config_ophyd_async_logging(level="DEBUG")
     sim_signal = Signal(SimSignalBackend(str, "test"), timeout=1, name="test_signal")
     await sim_signal.connect(sim=True)
-    assert caplog.text.endswith("Connecting to sim://test\n")
+    assert caplog.text.endswith("Connecting to soft://test_signal\n")
 
 
 async def test_signal_get_and_set_logging(caplog, mock_signal_rw):
diff --git a/tests/core/test_utils.py b/tests/core/test_utils.py
index 3907f50fa9..b2e22a46c0 100644
--- a/tests/core/test_utils.py
+++ b/tests/core/test_utils.py
@@ -136,7 +136,7 @@ async def test_error_handling_value_errors(caplog):
     caplog.set_level(10)
 
     dummy_device_two_working_one_timeout_two_value_error = (
-        DummyDeviceTwoWorkingTwoTimeOutTwoValueError()
+        DummyDeviceTwoWorkingTwoTimeOutTwoValueError("dsf")
     )
 
     # This should fail since the error is a ValueError