t7063: fix flaky untracked-cache test
authorDavid Turner <dturner@twopensource.com>
Mon, 19 Oct 2015 19:48:15 +0000 (15:48 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Oct 2015 01:32:28 +0000 (18:32 -0700)
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 <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7063-status-untracked-cache.sh
index 37a24c131240c46d0694e0a148ec7c15b89e17fe..0e8d0d42f2f5b1edbc18d46da77c956cd99dadec 100755 (executable)
@@ -412,7 +412,9 @@ test_expect_success 'create/modify files, some of which are gitignored' '
        echo two bis >done/two &&
        echo three >done/three && # three is gitignored
        echo four >done/four && # four is gitignored at a higher level
-       echo five >done/five # five is not gitignored
+       echo five >done/five && # five is not gitignored
+       echo test >base && #we need to ensure that the root dir is touched
+       rm base
 '
 
 test_expect_success 'test sparse status with untracked cache' '