Skip to content

Commit 9b680fb

Browse files
dturner-twgitster
authored andcommitted
t7063: fix flaky untracked-cache test
Dirty the test worktree's root directory, as the test expects. When testing the untracked-cache, we previously assumed that checking out master would be sufficient to mark the mtime of the worktree's root directory as racily-dirty. But sometimes, the checkout would happen at 12345.999 seconds and the status at 12346.001 seconds, meaning that the worktree's root directory would not be racily-dirty. And since it was not truly dirty, occasionally the test would fail. By making the root truly dirty, the test will always succeed. Tested by running a few hundred times. Signed-off-by: David Turner <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 73f9145 commit 9b680fb

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

t/t7063-status-untracked-cache.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,9 @@ test_expect_success 'create/modify files, some of which are gitignored' '
412412
echo two bis >done/two &&
413413
echo three >done/three && # three is gitignored
414414
echo four >done/four && # four is gitignored at a higher level
415-
echo five >done/five # five is not gitignored
415+
echo five >done/five && # five is not gitignored
416+
echo test >base && #we need to ensure that the root dir is touched
417+
rm base
416418
'
417419

418420
test_expect_success 'test sparse status with untracked cache' '

0 commit comments

Comments
 (0)