Commit 55d5656dafafcc0610b573a1d68d6051fa92c260 | snowbound

author	clover caruso <git@paperclover.net> 2026-10-03 19:10:44-07:00
committer	clover caruso <git@paperclover.net> 2026-10-03 19:15:52-07:00
log	55d5656dafafcc0610b573a1d68d6051fa92c260
tree	4b1f245087e2817da3447242687e4a53d5822ca2
parent	9a82329b95a69c3d3e1844133a9d3045db885758
signature	Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

Assisted-by: gpt-6.1-sol

1 files changed, 3 insertions(+), 1 deletions(-)

crates/notebook/tests/live_share.rs+3-1

 @@ -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);
 }