war on "sleep" in tests

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>

diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh
index dadbbc2a9f9b70a4e33f5aa825b8f9fe14eec124..f038f34b7c03b419b9341770a6924767a0b8e8d7 100755 (executable)
--- 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 &&
     '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 &&
      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." &&
 
      git commit -m "Add B." &&
 

-     sleep 2 &&

      echo AnotherSecond > C &&
      git update-index --add C &&
      echo AnotherSecond > C &&
      git update-index --add C &&

+     test_tick &&

      git commit -m "Add C." &&
 
      git checkout -f master &&
      git commit -m "Add C." &&
 
      git checkout -f master &&


@@ -35,6 +37,7 @@ test_expect_success \
 
      echo Third >> A &&
      git update-index A &&
 
      echo Third >> A &&
      git update-index A &&

+     test_tick &&

      git commit -m "Modify A." &&
 
      expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*"
      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 d7e327cc5bc5984546032fb085fb581de5755e11..e12fbea1b5df970f22a1526c4d9ba8fc32a027ba 100755 (executable)
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -54,7 +54,7 @@ EOF
 
 test_expect_success \
     'diff removed symlink' \
 
 test_expect_success \
     'diff removed symlink' \

-    'rm frotz &&
+    'mv frotz frotz2 &&

     git diff-index -M -p $tree > current &&
     compare_diff_patch current expected'
 
     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' \
 
 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'
 
     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 57f6d2bae7c63f13ee18e11737dbdcc0c080ab10..cde8390c1b9df6e6537a3538d8da11511b6644ec 100755 (executable)
--- 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 &&
 
 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
 '
 
        git merge c3
 '