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

Fix hangs in workspace tests

Browse Source
This commit is contained in:
Max Brunsfeld
2021-05-04 12:41:00 -07:00
parent 5c392f933f
commit 2b9a97a46e
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zed/src/file_finder.rs
+11 -8
View File
@@ -640,16 +640,19 @@ mod tests {
}));
let settings = settings::channel(&app.font_cache()).unwrap().1;
let (_, workspace) = app.add_window(|ctx| {
let mut workspace = Workspace::new(0, settings.clone(), ctx);
smol::block_on(workspace.open_paths(
&[tmp_dir.path().join("dir1"), tmp_dir.path().join("dir2")],
ctx,
));
workspace
});
let (_, workspace) = app.add_window(|ctx| Workspace::new(0, settings.clone(), ctx));
workspace
.update(&mut app, |workspace, ctx| {
workspace.open_paths(
&[tmp_dir.path().join("dir1"), tmp_dir.path().join("dir2")],
ctx,
)
})
.await;
app.read(|ctx| workspace.read(ctx).worktree_scans_complete(ctx))
.await;
let (_, finder) =
app.add_window(|ctx| FileFinder::new(settings, workspace.clone(), ctx));
zed/src/workspace.rs
+1 -1
View File
@@ -685,7 +685,7 @@ mod tests {
let (_, workspace) = app.add_window(|ctx| {
let mut workspace = Workspace::new(0, settings, ctx);
smol::block_on(workspace.open_paths(&[dir.path().into()], ctx));
workspace.open_path(dir.path().into(), ctx);
workspace
});