t5400 send-pack test: try a bit more nontrivial transfer.

Not that this reveals anything new, but I did test_tick shell
function in test-lib and found it rather cute and nice.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 28744b35e10602cf5076fbf5c62b3e767a847c0c..2c151912a3bcf2c91cfafcbc22f11bc71fedd34d 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -8,38 +8,63 @@ test_description='See why rewinding head breaks send-pack
 '
 . ./test-lib.sh
 
 '
 . ./test-lib.sh
 

-touch cpio-test
-test_expect_success 'working cpio' 'echo cpio-test | cpio -o > /dev/null'
-
-cnt='1'
+cnt=64

 test_expect_success setup '
 test_expect_success setup '

+       test_tick &&
+       mkdir mozart mozart/is &&
+       echo "Commit #0" >mozart/is/pink &&
+       git-update-index --add mozart/is/pink &&

        tree=$(git-write-tree) &&
        commit=$(echo "Commit #0" | git-commit-tree $tree) &&
        zero=$commit &&
        parent=$zero &&
        tree=$(git-write-tree) &&
        commit=$(echo "Commit #0" | git-commit-tree $tree) &&
        zero=$commit &&
        parent=$zero &&

-       for i in $cnt
+       i=0 &&
+       while test $i -le $cnt

        do
        do

-           sleep 1 &&
+           i=$(($i+1)) &&
+           test_tick &&
+           echo "Commit #$i" >mozart/is/pink &&
+           git-update-index --add mozart/is/pink &&
+           tree=$(git-write-tree) &&

            commit=$(echo "Commit #$i" | git-commit-tree $tree -p $parent) &&
            commit=$(echo "Commit #$i" | git-commit-tree $tree -p $parent) &&

+           git-update-ref refs/tags/commit$i $commit &&

            parent=$commit || return 1
        done &&
        git-update-ref HEAD "$commit" &&
            parent=$commit || return 1
        done &&
        git-update-ref HEAD "$commit" &&

-       git-clone -l ./. victim &&
+       git-clone ./. victim &&

        cd victim &&
        git-log &&
        cd .. &&
        git-update-ref HEAD "$zero" &&
        parent=$zero &&
        cd victim &&
        git-log &&
        cd .. &&
        git-update-ref HEAD "$zero" &&
        parent=$zero &&

-       for i in $cnt
+       i=0 &&
+       while test $i -le $cnt

        do
        do

-           sleep 1 &&
+           i=$(($i+1)) &&
+           test_tick &&
+           echo "Rebase #$i" >mozart/is/pink &&
+           git-update-index --add mozart/is/pink &&
+           tree=$(git-write-tree) &&

            commit=$(echo "Rebase #$i" | git-commit-tree $tree -p $parent) &&
            commit=$(echo "Rebase #$i" | git-commit-tree $tree -p $parent) &&

+           git-update-ref refs/tags/rebase$i $commit &&

            parent=$commit || return 1
        done &&
        git-update-ref HEAD "$commit" &&
        echo Rebase &&
        git-log'
 
            parent=$commit || return 1
        done &&
        git-update-ref HEAD "$commit" &&
        echo Rebase &&
        git-log'
 

+test_expect_success 'pack the source repository' '
+       git repack -a -d &&
+       git prune
+'
+
+test_expect_success 'pack the destination repository' '
+       cd victim &&
+       git repack -a -d &&
+       git prune &&
+       cd ..
+'
+

 test_expect_success \
         'pushing rewound head should not barf but require --force' ' 
        # should not fail but refuse to update.
 test_expect_success \
         'pushing rewound head should not barf but require --force' ' 
        # should not fail but refuse to update.

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 98f69d89f395bfba8c77ab5a09f345f968f0ef4f..bf108d4226fabf847f42420547471dfb3cef8a8e 100755 (executable)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -96,6 +96,17 @@ test_count=0
 
 trap 'echo >&5 "FATAL: Unexpected exit with code $?"; exit 1' exit
 
 
 trap 'echo >&5 "FATAL: Unexpected exit with code $?"; exit 1' exit
 

+test_tick () {
+       if test -z "${test_tick+set}"
+       then
+               test_tick=432630000
+       else
+               test_tick=$(($test_tick + 60))
+       fi
+       GIT_COMMITTER_DATE=$test_tick
+       GIT_AUTHOR_DATE=$test_tick
+       export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
+}

 
 # You are not expected to call test_ok_ and test_failure_ directly, use
 # the text_expect_* functions instead.
 
 # You are not expected to call test_ok_ and test_failure_ directly, use
 # the text_expect_* functions instead.