From 0cdbd4d1f192d4eb2e82eb0e7de03f2d1743b961 Mon Sep 17 00:00:00 2001
From: Logan Johnson <loganj@squareup.com>
Date: Mon, 26 Oct 2026 17:27:12 -0400
Subject: [PATCH] test(relay): do not wait for a live sync task to end before
 replacing it

The new replacement test awaited the join handle of a live sync before
sending the replacing REQ, so it waited forever and timed out the
PostgreSQL job. It now keeps the handle and asserts that the sync ends
after the replacement. Each case uses its own channel, so earlier cases'
artifacts do not reach a later sync's initial set.

Co-authored-by: Larry <627498bd4bd1f281a16431e3c6cce3b5c25b6692798c78672298aefbf2f8f8b5@buzz.block.builderlab.xyz>
Signed-off-by: Logan Johnson <loganj@squareup.com>
---
 .../handlers/artifact_sync_postgres_tests.rs  | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/crates/buzz-relay/src/handlers/artifact_sync_postgres_tests.rs b/crates/buzz-relay/src/handlers/artifact_sync_postgres_tests.rs
index 347585fd63..2314409fed 100644
--- a/crates/buzz-relay/src/handlers/artifact_sync_postgres_tests.rs
+++ b/crates/buzz-relay/src/handlers/artifact_sync_postgres_tests.rs
@@ -550,16 +550,18 @@ async fn ordinary_req(f: &Fixture, conn: &Arc<ConnectionState>, filters: Vec<Val
 async fn refused_or_one_shot_replacement_retires_the_old_holder() {
     let f = fixture().await;
     let owner = Keys::generate();
-    let home = create_channel(&f.state, &f.tenant, &owner, &[]).await;
-    let mixed = vec![
-        json!({"search": "x", "#h": [home]}),
-        json!({"kinds": [45010], "#h": [home]}),
-    ];
-    let liveness = vec![json!({"kinds": [buzz_core::kind::KIND_HUDDLE_LIVENESS], "#h": [home]})];
+    let mixed: fn(Uuid) -> Vec<Value> = |home| {
+        vec![
+            json!({"search": "x", "#h": [home]}),
+            json!({"kinds": [45010], "#h": [home]}),
+        ]
+    };
+    let liveness: fn(Uuid) -> Vec<Value> =
+        |home| vec![json!({"kinds": [buzz_core::kind::KIND_HUDDLE_LIVENESS], "#h": [home]})];
     for (sync_holder, replacement, terminal) in [
         (
             true,
-            &mixed,
+            mixed,
             json!([
                 "CLOSED",
                 "s",
@@ -568,20 +570,21 @@ async fn refused_or_one_shot_replacement_retires_the_old_holder() {
         ),
         (
             false,
-            &mixed,
+            mixed,
             json!([
                 "CLOSED",
                 "s",
                 "error: mixed search and non-search filters not supported"
             ]),
         ),
-        (true, &liveness, json!(["EOSE", "s"])),
-        (false, &liveness, json!(["EOSE", "s"])),
+        (true, liveness, json!(["EOSE", "s"])),
+        (false, liveness, json!(["EOSE", "s"])),
     ] {
         let case = format!("sync holder: {sync_holder}, replacement: {terminal}");
+        let home = create_channel(&f.state, &f.tenant, &owner, &[]).await;
         let (conn, mut rx) = connect(&f, &owner);
-        if sync_holder {
-            start_sync(&f, &conn, sync_filter(&[home])).await.unwrap();
+        let sync = if sync_holder {
+            Some(start_sync(&f, &conn, sync_filter(&[home])))
         } else {
             ordinary_req(
                 &f,
@@ -589,11 +592,18 @@ async fn refused_or_one_shot_replacement_retires_the_old_holder() {
                 vec![json!({"kinds": [45010], "#h": [home], "limit": 0})],
             )
             .await;
-        }
+            None
+        };
         assert!(initial_set(&mut rx).await.is_empty(), "{case}");
 
-        ordinary_req(&f, &conn, replacement.clone()).await;
+        ordinary_req(&f, &conn, replacement(home)).await;
         assert_eq!(frame(&mut rx).await, terminal, "{case}");
+        if let Some(sync) = sync {
+            tokio::time::timeout(Duration::from_secs(5), sync)
+                .await
+                .expect("the replaced sync ends")
+                .unwrap();
+        }
         assert!(conn.subscriptions.lock().await.is_empty(), "{case}");
         assert!(
             !f.state.artifact_syncs.contains(conn.conn_id, "s"),