From c757b3f46ebe893cdef9ba94d96e2b1833ff4e8a Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 12 May 2021 16:20:22 -0700
Subject: [PATCH] Allow a longer timeout in buffer conflict test

---
 zed/src/editor/buffer/mod.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zed/src/editor/buffer/mod.rs b/zed/src/editor/buffer/mod.rs
index 190564a4b448809c7ae55c87b5373a3576a34882..bc672a1ffcccaa5a20c7287f817b8e2f3e5dc7b8 100644
--- a/zed/src/editor/buffer/mod.rs
+++ b/zed/src/editor/buffer/mod.rs
@@ -3263,7 +3263,9 @@ mod tests {
         // Becaues the buffer is modified, it doesn't reload from disk, but is
         // marked as having a conflict.
         buffer
-            .condition(&app, |buffer, _| buffer.has_conflict())
+            .condition_with_duration(Duration::from_millis(500), &app, |buffer, _| {
+                buffer.has_conflict()
+            })
             .await;
     }