From 55d5656dafafcc0610b573a1d68d6051fa92c260 Mon Sep 17 00:00:00 2001 From: clover caruso Date: Sat, 3 Oct 2026 19:10:44 -0700 Subject: [PATCH] test: wait for host-merged conflicts to reach guests Assisted-by: gpt-6.1-sol --- crates/notebook/tests/live_share.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/notebook/tests/live_share.rs b/crates/notebook/tests/live_share.rs index 95eadeb8882740a24e87d901e0aa8e0c7178738f..c6aafd8b8c63884b7677c7bab214dbbb5ca283b2 100644 --- a/crates/notebook/tests/live_share.rs +++ b/crates/notebook/tests/live_share.rs @@ -133,7 +133,9 @@ fn two_guests_on_one_page_conflict_as_on_a_share() { texts.contains(&"Grace's text".to_owned()) && texts.contains(&"Alan's text".to_owned()), "{texts:?}" ); - assert!(!alans.conflicts().unwrap().is_empty() || !graces.conflicts().unwrap().is_empty()); + until("the host's conflict never reached a guest", || { + !alans.conflicts().unwrap().is_empty() || !graces.conflicts().unwrap().is_empty() + }); drop(host); } -- 2.54.0