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

Reinstate failing worktree tests (#26733)

Browse source 
Just debugging for now

Release Notes:

- N/A
This commit is contained in:
Cole Miller 2025-03-14 18:20:24 -04:00 • committed by GitHub
parent f2f9c786da
commit 768dfc8b6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 131 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/worktree/src/worktree_tests.rs
View file

@ -845,9 +845,7 @@ async fn test_update_gitignore(cx: &mut TestAppContext) {
});
}
// TODO: Fix flaky test.
// #[gpui::test]
#[allow(unused)]
#[gpui::test]
async fn test_write_file(cx: &mut TestAppContext) {
init_test(cx);
cx.executor().allow_parking();
@ -2432,9 +2430,7 @@ async fn test_git_repository_for_path(cx: &mut TestAppContext) {
// 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)]
#[gpui::test]
#[cfg_attr(target_os = "windows", ignore)]
async fn test_file_status(cx: &mut TestAppContext) {
init_test(cx);
@ -2627,9 +2623,7 @@ async fn test_file_status(cx: &mut TestAppContext) {
});
}
// TODO: Fix flaky test.
// #[gpui::test]
#[allow(unused)]
#[gpui::test]
async fn test_git_repository_status(cx: &mut TestAppContext) {
init_test(cx);
cx.executor().allow_parking();
@ -2743,9 +2737,7 @@ async fn test_git_repository_status(cx: &mut TestAppContext) {
});
}
// TODO: Fix flaky test.
// #[gpui::test]
#[allow(unused)]
#[gpui::test]
async fn test_git_status_postprocessing(cx: &mut TestAppContext) {
init_test(cx);
cx.executor().allow_parking();
@ -3541,8 +3533,6 @@ 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;
@ -3552,8 +3542,6 @@ 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");