TEMP: Test changes

Author: AlexanderWells-diamond

tests/test_records.py

@@ -693,13 +693,14 @@ def on_update_recursive_set_test_func(
         async def on_update_func(new_val):
             log("CHILD: on_update_func started")
             record.set(0, process=False)
+            conn.send("C")  # "Callback"
             log("CHILD: on_update_func ended")
 
         record = builder.Action(
             "ACTION",
             on_update=on_update_func,
             blocking=True,
-            initial_value=1 # A non-zero value, to check it changes
+            initial_value=1  # A non-zero value, to check it changes
         )
 
         dispatcher = asyncio_dispatcher.AsyncioDispatcher()
@@ -717,8 +718,7 @@ async def on_update_func(new_val):
 
         log("CHILD: Received exit command, child exiting")
 
-
-    async def test_on_update_recursive_set(self, capsys):
+    async def test_on_update_recursive_set(self):
         """Test that on_update functions correctly when the on_update
         callback sets the value of the record again (with process=False).
         See issue #201"""
@@ -747,17 +747,22 @@ async def test_on_update_recursive_set(self, capsys):
 
             record = f"{device_name}:ACTION"
 
+            val = await caget(record)
+
+            assert val == 1, "ACTION record did not start with value 1"
+
             await caput(record, 1, wait=True)
 
             val = await caget(record)
 
             assert val == 0, "ACTION record did not return to zero value"
 
+            # Expect one "C"
+            select_and_recv(parent_conn, "C")
 
-            # Now check that only one set of log messages was printed
-            captured = capsys.readouterr()
-            instances = re.findall("CHILD: on_update_func started", captured.out)
-            assert len(instances) == 1, "Multiple log messages detected"
+            # ...But if we receive another we know there's a problem
+            if parent_conn.poll(5):  # Shorter timeout to make this quicker
+                pytest.fail("Received unexpected second message")
 
         finally:
             log("PARENT:Sending Done command to child")