fix(test): add sleep to avoid racy git index on macOS #459
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The test_list_full_working_tree_conflicts test was failing on macOS CI due to a racy git index issue. When a file is written and immediately followed by `git status --porcelain`, git may not detect the change if the mtime falls within the same filesystem time resolution window as the previous operation. This is a known "racy git" issue where git compares file mtimes with the index mtime. On macOS (especially in CI), the filesystem time resolution can cause git to miss changes that happen too quickly. Solution: Add a 10ms sleep after writing the file to ensure git status sees the modification. This is consistent with similar sleeps used in other tests for background operations. Fixes test failure: test_list_full_working_tree_conflicts Related CI run: https://github.com/max-sixty/worktrunk/actions/runs/20766615917 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
The
test_list_full_working_tree_conflictstest was failing on macOS CI with the following symptom:✗(WouldConflict)↓(Behind)The test writes an uncommitted file and immediately runs
wt list --full, which internally runsgit status --porcelainto check if the working tree is dirty before running conflict detection.Root Cause
This is a known "racy git" issue where git compares file mtimes with the index mtime. If a file is modified within the same filesystem time resolution window as the previous git operation,
git statusmay not detect the change.macOS filesystems (especially in CI) can have this issue more frequently than Linux due to timing and filesystem characteristics.
Solution
Add a 10ms sleep after writing the uncommitted file, before running
wt list --full. This ensures git sees the modification.This approach is consistent with similar sleeps used elsewhere in the test suite for timing-sensitive operations.
Testing
Related
This is an automated fix for human review.