undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

war on "sleep" in tests

Browse Source 
In many places in test suite we have "sleep"s that do not have to be
there.

 - I do not simply see the point of the one in t3500.  It may be making
   sure that the timestamp order of commits generated during the test is
   stable, in which case test_tick is the right ingredient to use without
   wasting tester's time.

 - The one in t4011 is to make sure that the plumbing diff-index notices
   the stat-dirtyness of a removed then identically recreated symlink.
   Keeping the old symlink around to make sure that a newly created
   symlink gets different ino would be sufficient for that purpose.

 - The one in t7600 is to make sure that "git merge" does not get confused
   by stat-dirty "file" in the working tree.  Again, keeping the old file
   around and creating an identical copy to ensure a different ino would
   be sufficient for that purpose.

The "racy git" tests in t0010 are inherently about mtime between the index
itself and index entries.  The "sleep" in that test must stay as they are.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2010-04-06 17:08:54 -07:00
parent 537f6c7fb4
commit 016e5ff243
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/t3500-cherry.sh
View File

@ -17,17 +17,19 @@ test_expect_success \
'prepare repository with topic branch, and check cherry finds the 2 patches from there' \ 'prepare repository with topic branch, and check cherry finds the 2 patches from there' \
'echo First > A && 'echo First > A &&
git update-index --add A && git update-index --add A &&
test_tick &&
git commit -m "Add A." && git commit -m "Add A." &&
git checkout -b my-topic-branch && git checkout -b my-topic-branch &&
echo Second > B && echo Second > B &&
git update-index --add B && git update-index --add B &&
test_tick &&
git commit -m "Add B." && git commit -m "Add B." &&
sleep 2 &&
echo AnotherSecond > C && echo AnotherSecond > C &&
git update-index --add C && git update-index --add C &&
test_tick &&
git commit -m "Add C." && git commit -m "Add C." &&
git checkout -f master && git checkout -f master &&
@ -35,6 +37,7 @@ test_expect_success \
echo Third >> A && echo Third >> A &&
git update-index A && git update-index A &&
test_tick &&
git commit -m "Modify A." && git commit -m "Modify A." &&
expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*" expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*"

5
t/t4011-diff-symlink.sh
View File

@ -54,7 +54,7 @@ EOF
test_expect_success \ test_expect_success \
'diff removed symlink' \ 'diff removed symlink' \
'rm frotz && 'mv frotz frotz2 &&
git diff-index -M -p $tree > current && git diff-index -M -p $tree > current &&
compare_diff_patch current expected' compare_diff_patch current expected'
@ -64,8 +64,7 @@ EOF
test_expect_success \ test_expect_success \
'diff identical, but newly created symlink' \ 'diff identical, but newly created symlink' \
'sleep 3 && 'ln -s xyzzy frotz &&
ln -s xyzzy frotz &&
git diff-index -M -p $tree > current && git diff-index -M -p $tree > current &&
compare_diff_patch current expected' compare_diff_patch current expected'

3
t/t7600-merge.sh
View File

@ -554,8 +554,7 @@ test_debug 'gitk --all'
test_expect_success 'refresh the index before merging' ' test_expect_success 'refresh the index before merging' '
git reset --hard c1 && git reset --hard c1 &&
sleep 1 && cp file file.n && mv -f file.n file &&
touch file &&
git merge c3 git merge c3
' '