Fix Iroh wait_for runtime and isolate the two-process sync test.

start_peer is process-global; a prior in-memory start stole the node
from the P2P test. wait_for must construct timeout inside block_on.

Co-authored-by: joepmeindertsma <joepmeindertsma@gmail.com>

Author: cursoragent

python/src/peer.rs

@@ -145,7 +145,7 @@ async fn recv_change(db: &Db, target: Subject) -> String {
 pub(crate) fn wait_for(db: &Db, subject: &str, timeout: f64) -> PyResult<String> {
     let target = Subject::from_raw(subject, db.get_base_domain().as_deref()).without_params();
     let dur = Duration::from_secs_f64(timeout.max(0.0));
-    match block_on(tokio::time::timeout(dur, recv_change(db, target))) {
+    match block_on(async { tokio::time::timeout(dur, recv_change(db, target)).await }) {
         Ok(s) => Ok(s),
         Err(_) => Err(PyTimeoutError::new_err(format!(
             "timed out waiting for {subject}"

python/tests/iroh_peer_child.py

@@ -23,8 +23,11 @@ def main() -> None:
                 "ok": bool(got) and got["name"] == hs["name"],
                 "imported": report.imported,
                 "pushed": report.pushed,
+                "in_sync": report.in_sync,
+                "peer_name": report.peer_name,
                 "name": got["name"] if got else None,
                 "has_drive": store.has(hs["drive"]),
+                "child_peer": store.peer_id,
             }
         )
     )

python/tests/test_iroh.py

@@ -40,18 +40,9 @@ def test_wait_for_times_out():
         store.wait_for("did:ad:does-not-change", timeout=0.2)
 
 
-def test_start_peer_returns_node_uri():
-    store = Store.in_memory()
-    store.setup("Ada")
-    store.device_name = "pytest-a"
-    node = store.start_peer()
-    assert node.startswith("did:ad:node:")
-    assert store.peer_id == node
-    # Idempotent.
-    assert store.start_peer() == node
-
-
 def test_two_process_iroh_sync(tmp_path):
+    # `start_peer` is process-global. This must be the only test in this
+    # process that starts Iroh, and it must own the store the node serves.
     path_a = tmp_path / "a"
     path_b = tmp_path / "b"
     handshake = tmp_path / "handshake.json"
@@ -61,6 +52,8 @@ def test_two_process_iroh_sync(tmp_path):
     setup = store.setup("Ada")
     store.device_name = "pytest-parent"
     node = store.start_peer()
+    assert node.startswith("did:ad:node:")
+    assert store.peer_id == node
     note = store.create(urls.FOLDER, name="From A")
     store.flush()
     handshake.write_text(