Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix flaky open_paths_action test (#3944)

Browse source 
I've missed a single run_until_parked call. mb

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-01-08 19:08:09 +01:00 • committed by GitHub
parent 46a99feb97
commit 4ebff57fa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 101 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

201
crates/zed/src/zed.rs
View file

@ -791,110 +791,111 @@ mod tests {
WorkspaceHandle, WorkspaceHandle,
}; };
// #[gpui::test] #[gpui::test]
// async fn test_open_paths_action(cx: &mut TestAppContext) { async fn test_open_paths_action(cx: &mut TestAppContext) {
// let app_state = init_test(cx); let app_state = init_test(cx);
// app_state app_state
// .fs .fs
// .as_fake() .as_fake()
// .insert_tree( .insert_tree(
// "/root", "/root",
// json!({ json!({
// "a": { "a": {
// "aa": null, "aa": null,
// "ab": null, "ab": null,
// }, },
// "b": { "b": {
// "ba": null, "ba": null,
// "bb": null, "bb": null,
// }, },
// "c": { "c": {
// "ca": null, "ca": null,
// "cb": null, "cb": null,
// }, },
// "d": { "d": {
// "da": null, "da": null,
// "db": null, "db": null,
// }, },
// }), }),
// ) )
// .await; .await;
// cx.update(|cx| { cx.update(|cx| {
// open_paths( open_paths(
// &[PathBuf::from("/root/a"), PathBuf::from("/root/b")], &[PathBuf::from("/root/a"), PathBuf::from("/root/b")],
// &app_state, &app_state,
// None, None,
// cx, cx,
// ) )
// }) })
// .await .await
// .unwrap(); .unwrap();
// assert_eq!(cx.read(|cx| cx.windows().len()), 1); assert_eq!(cx.read(|cx| cx.windows().len()), 1);
// cx.update(|cx| open_paths(&[PathBuf::from("/root/a")], &app_state, None, cx)) cx.update(|cx| open_paths(&[PathBuf::from("/root/a")], &app_state, None, cx))
// .await .await
// .unwrap(); .unwrap();
// assert_eq!(cx.read(|cx| cx.windows().len()), 1); assert_eq!(cx.read(|cx| cx.windows().len()), 1);
// let workspace_1 = cx let workspace_1 = cx
// .read(|cx| cx.windows()[0].downcast::<Workspace>()) .read(|cx| cx.windows()[0].downcast::<Workspace>())
// .unwrap(); .unwrap();
// workspace_1 workspace_1
// .update(cx, |workspace, cx| { .update(cx, |workspace, cx| {
// assert_eq!(workspace.worktrees(cx).count(), 2); assert_eq!(workspace.worktrees(cx).count(), 2);
// assert!(workspace.left_dock().read(cx).is_open()); assert!(workspace.left_dock().read(cx).is_open());
// assert!(workspace assert!(workspace
// .active_pane() .active_pane()
// .read(cx) .read(cx)
// .focus_handle(cx) .focus_handle(cx)
// .is_focused(cx)); .is_focused(cx));
// }) })
// .unwrap(); .unwrap();
// cx.update(|cx| { cx.update(|cx| {
// open_paths( open_paths(
// &[PathBuf::from("/root/b"), PathBuf::from("/root/c")], &[PathBuf::from("/root/b"), PathBuf::from("/root/c")],
// &app_state, &app_state,
// None, None,
// cx, cx,
// ) )
// }) })
// .await .await
// .unwrap(); .unwrap();
// assert_eq!(cx.read(|cx| cx.windows().len()), 2); assert_eq!(cx.read(|cx| cx.windows().len()), 2);
// // Replace existing windows // Replace existing windows
// let window = cx let window = cx
// .update(|cx| cx.windows()[0].downcast::<Workspace>()) .update(|cx| cx.windows()[0].downcast::<Workspace>())
// .unwrap(); .unwrap();
// cx.update(|cx| { cx.update(|cx| {
// open_paths( open_paths(
// &[PathBuf::from("/root/c"), PathBuf::from("/root/d")], &[PathBuf::from("/root/c"), PathBuf::from("/root/d")],
// &app_state, &app_state,
// Some(window), Some(window),
// cx, cx,
// ) )
// }) })
// .await .await
// .unwrap(); .unwrap();
// assert_eq!(cx.read(|cx| cx.windows().len()), 2); cx.background_executor.run_until_parked();
// let workspace_1 = cx assert_eq!(cx.read(|cx| cx.windows().len()), 2);
// .update(|cx| cx.windows()[0].downcast::<Workspace>()) let workspace_1 = cx
// .unwrap(); .update(|cx| cx.windows()[0].downcast::<Workspace>())
// workspace_1 .unwrap();
// .update(cx, |workspace, cx| { workspace_1
// assert_eq!( .update(cx, |workspace, cx| {
// workspace assert_eq!(
// .worktrees(cx) workspace
// .map(|w| w.read(cx).abs_path()) .worktrees(cx)
// .collect::<Vec<_>>(), .map(|w| w.read(cx).abs_path())
// &[Path::new("/root/c").into(), Path::new("/root/d").into()] .collect::<Vec<_>>(),
// ); &[Path::new("/root/c").into(), Path::new("/root/d").into()]
// assert!(workspace.left_dock().read(cx).is_open()); );
// assert!(workspace.active_pane().focus_handle(cx).is_focused(cx)); assert!(workspace.left_dock().read(cx).is_open());
// }) assert!(workspace.active_pane().focus_handle(cx).is_focused(cx));
// .unwrap(); })
// } .unwrap();
}
#[gpui::test] #[gpui::test]
async fn test_window_edit_state(cx: &mut TestAppContext) { async fn test_window_edit_state(cx: &mut TestAppContext) {