From 37f0ba9586b739d9e529cb2b1a8c7c71794deb74 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 13 May 2021 11:38:39 +0200
Subject: [PATCH] Increase timeout for fs-dependent conditions

---
 zed/src/editor/buffer/mod.rs |  6 ++++--
 zed/src/workspace.rs         | 14 ++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/zed/src/editor/buffer/mod.rs b/zed/src/editor/buffer/mod.rs
index f26ccd50b82935f2331a56035f4e07bee3e422f0..1bdf050f0539dba4553782d41f82e07abfe6fde2 100644
--- a/zed/src/editor/buffer/mod.rs
+++ b/zed/src/editor/buffer/mod.rs
@@ -3152,7 +3152,7 @@ mod tests {
 
             fs::remove_file(dir.path().join("file2")).unwrap();
             buffer2
-                .condition(&app, |buffer2, _| buffer2.is_dirty())
+                .condition_with_duration(Duration::from_millis(500), &app, |b, _| b.is_dirty())
                 .await;
             assert_eq!(
                 *events.borrow(),
@@ -3178,7 +3178,9 @@ mod tests {
             events.borrow_mut().clear();
             fs::remove_file(dir.path().join("file3")).unwrap();
             buffer3
-                .condition(&app, |_, _| !events.borrow().is_empty())
+                .condition_with_duration(Duration::from_millis(500), &app, |_, _| {
+                    !events.borrow().is_empty()
+                })
                 .await;
             assert_eq!(*events.borrow(), &[Event::FileHandleChanged]);
             app.read(|ctx| assert!(buffer3.read(ctx).is_dirty()));
diff --git a/zed/src/workspace.rs b/zed/src/workspace.rs
index 328ebf30e8413f637f7f486f52dca51e0ca5191a..833a74d112dc18d328f8a8ca8310cd3b79477d23 100644
--- a/zed/src/workspace.rs
+++ b/zed/src/workspace.rs
@@ -759,7 +759,7 @@ mod tests {
     use super::*;
     use crate::{editor::BufferView, settings, test::temp_tree};
     use serde_json::json;
-    use std::{collections::HashSet, fs};
+    use std::{collections::HashSet, fs, time::Duration};
     use tempdir::TempDir;
 
     #[gpui::test]
@@ -1031,14 +1031,18 @@ mod tests {
         app.update(|ctx| editor.update(ctx, |editor, ctx| editor.insert(&"x".to_string(), ctx)));
         fs::write(dir.path().join("a.txt"), "changed").unwrap();
         editor
-            .condition(&app, |editor, ctx| editor.has_conflict(ctx))
+            .condition_with_duration(Duration::from_millis(500), &app, |editor, ctx| {
+                editor.has_conflict(ctx)
+            })
             .await;
         app.read(|ctx| assert!(editor.is_dirty(ctx)));
 
         app.update(|ctx| workspace.update(ctx, |w, ctx| w.save_active_item(&(), ctx)));
         app.simulate_prompt_answer(window_id, 0);
         editor
-            .condition(&app, |editor, ctx| !editor.is_dirty(ctx))
+            .condition_with_duration(Duration::from_millis(500), &app, |editor, ctx| {
+                !editor.is_dirty(ctx)
+            })
             .await;
         app.read(|ctx| assert!(!editor.has_conflict(ctx)));
     }
@@ -1095,7 +1099,9 @@ mod tests {
 
         // When the save completes, the buffer's title is updated.
         editor
-            .condition(&app, |editor, ctx| !editor.is_dirty(ctx))
+            .condition_with_duration(Duration::from_millis(500), &app, |editor, ctx| {
+                !editor.is_dirty(ctx)
+            })
             .await;
         app.read(|ctx| {
             assert!(!editor.is_dirty(ctx));