Skip to content

fix(test): add sleep to avoid racy git index on macOS #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
max-sixty merged 1 commit into from
Jan 7, 2026
Merged

fix(test): add sleep to avoid racy git index on macOS #459

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tests/integration_tests/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2200,6 +2200,11 @@ fn test_list_full_working_tree_conflicts(mut repo: TestRepo) {
// Now add uncommitted changes to feature that would conflict with main
std::fs::write(feature.join("shared.txt"), "feature's uncommitted version").unwrap();

// Sleep briefly to avoid racy git index caching issues on macOS
// Git compares mtimes, and if the write happens within the same filesystem time
// resolution window as the previous commit, git status may not detect the change.
std::thread::sleep(std::time::Duration::from_millis(10));

// Without --full: no conflict symbol (only checks commit-level)
assert_cmd_snapshot!(
"working_tree_conflicts_without_full",
Expand Down