mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/test-sleepless'

Browse Source 
* jc/test-sleepless:
  war on "sleep" in tests
This commit is contained in:
Junio C Hamano
2010-05-08 22:36:23 -07:00
parent a9eb304129 016e5ff243
commit 301c4f9709
3 changed files with 7 additions and 6 deletions
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
' '