diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-05-09 09:36:23 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-05-09 09:36:23 +0400 |
commit | 301c4f970913fc52be7a6b667fb5a4945e9276d0 (patch) | |
tree | 8652467db21d479e084282c86e1c0301286d7524 | |
parent | a9eb30412942224c1494357f495b8b2a4b3d46b8 (diff) | |
parent | 016e5ff24345f974a084375da83ee143b5f2772d (diff) |
Merge branch 'jc/test-sleepless'
* jc/test-sleepless:
war on "sleep" in tests
-rwxr-xr-x | t/t3500-cherry.sh | 5 | ||||
-rwxr-xr-x | t/t4011-diff-symlink.sh | 5 | ||||
-rwxr-xr-x | t/t7600-merge.sh | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh index dadbbc2a9f..f038f34b7c 100755 --- a/t/t3500-cherry.sh +++ b/t/t3500-cherry.sh @@ -17,17 +17,19 @@ test_expect_success \ 'prepare repository with topic branch, and check cherry finds the 2 patches from there' \ 'echo First > A && git update-index --add A && + test_tick && git commit -m "Add A." && git checkout -b my-topic-branch && echo Second > B && git update-index --add B && + test_tick && git commit -m "Add B." && - sleep 2 && echo AnotherSecond > C && git update-index --add C && + test_tick && git commit -m "Add C." && git checkout -f master && @@ -35,6 +37,7 @@ test_expect_success \ echo Third >> A && git update-index A && + test_tick && git commit -m "Modify A." && expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*" diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh index d7e327cc5b..e12fbea1b5 100755 --- a/t/t4011-diff-symlink.sh +++ b/t/t4011-diff-symlink.sh @@ -54,7 +54,7 @@ EOF test_expect_success \ 'diff removed symlink' \ - 'rm frotz && + 'mv frotz frotz2 && git diff-index -M -p $tree > current && compare_diff_patch current expected' @@ -64,8 +64,7 @@ EOF test_expect_success \ 'diff identical, but newly created symlink' \ - 'sleep 3 && - ln -s xyzzy frotz && + 'ln -s xyzzy frotz && git diff-index -M -p $tree > current && compare_diff_patch current expected' diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 57f6d2bae7..cde8390c1b 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -554,8 +554,7 @@ test_debug 'gitk --all' test_expect_success 'refresh the index before merging' ' git reset --hard c1 && - sleep 1 && - touch file && + cp file file.n && mv -f file.n file && git merge c3 ' |