oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase timeout for fs-dependent conditions

Browse Source
This commit is contained in:
Antonio Scandurra
2021-05-13 11:38:39 +02:00
parent 4884a05a73
commit 37f0ba9586
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zed/src/editor/buffer/mod.rs
+4 -2
View File
@@ -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()));
zed/src/workspace.rs
+10 -4
View File
@@ -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));