From dffa725c7d7760a38875b1dc2e7a175729b830ac Mon Sep 17 00:00:00 2001 From: Cole Miller Date: Thu, 13 Mar 2025 17:09:16 -0400 Subject: [PATCH] worktree: Disable flaky `test_file_status` test (#26729) See also: - https://github.com/zed-industries/zed/pull/26684 - https://github.com/zed-industries/zed/pull/26710 Release Notes: - N/A --- crates/worktree/src/worktree_tests.rs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/crates/worktree/src/worktree_tests.rs b/crates/worktree/src/worktree_tests.rs index 5814a5ad61..e0aa1e9331 100644 --- a/crates/worktree/src/worktree_tests.rs +++ b/crates/worktree/src/worktree_tests.rs @@ -2428,12 +2428,13 @@ async fn test_git_repository_for_path(cx: &mut TestAppContext) { }); } -// NOTE: -// This test always fails on Windows, because on Windows, unlike on Unix, you can't rename -// a directory which some program has already open. -// This is a limitation of the Windows. -// See: https://stackoverflow.com/questions/41365318/access-is-denied-when-renaming-folder -#[gpui::test] +// NOTE: This test always fails on Windows, because on Windows, unlike on Unix, +// you can't rename a directory which some program has already open. This is a +// limitation of the Windows. See: +// https://stackoverflow.com/questions/41365318/access-is-denied-when-renaming-folder +// TODO: Fix flaky test. +// #[gpui::test] +#[allow(unused)] #[cfg_attr(target_os = "windows", ignore)] async fn test_file_status(cx: &mut TestAppContext) { init_test(cx); @@ -3540,6 +3541,8 @@ fn git_cherry_pick(commit: &git2::Commit<'_>, repo: &git2::Repository) { repo.cherrypick(commit, None).expect("Failed to cherrypick"); } +// TODO: Remove allow(unused) once flaky tests are reinstated +#[allow(unused)] #[track_caller] fn git_stash(repo: &mut git2::Repository) { use git2::Signature; @@ -3549,6 +3552,8 @@ fn git_stash(repo: &mut git2::Repository) { .expect("Failed to stash"); } +// TODO: Remove allow(unused) once flaky tests are reinstated +#[allow(unused)] #[track_caller] fn git_reset(offset: usize, repo: &git2::Repository) { let head = repo.head().expect("Couldn't get repo head");