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

t6010 (merge-base): modernize style

Browse Source 
Guard setup with test_expect_success, put the opening quote
starting each test on the same line as the test_expect_* invocation,
and combine related actions into single tests.

While at it:

 - use test_cmp instead of expr or test $foo = $bar, for more helpful
   output with -v when tests fail;

 - use test_commit for brevity.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder
2010-08-17 01:57:12 -05:00
committed by Junio C Hamano
parent 94d63ce2ab
commit 9cbdd76e09
1 changed files with 150 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

207
t/t6010-merge-base.sh
View File

@ -8,64 +8,77 @@ test_description='Merge base computation.
. ./test-lib.sh . ./test-lib.sh
T=$(git write-tree) test_expect_success 'setup' '
T=$(git write-tree) &&
M=1130000000 M=1130000000 &&
Z=+0000 Z=+0000 &&
GIT_COMMITTER_EMAIL=git@comm.iter.xz GIT_COMMITTER_EMAIL=git@comm.iter.xz &&
GIT_COMMITTER_NAME='C O Mmiter' GIT_COMMITTER_NAME="C O Mmiter" &&
GIT_AUTHOR_NAME='A U Thor' GIT_AUTHOR_NAME="A U Thor" &&
GIT_AUTHOR_EMAIL=git@au.thor.xz GIT_AUTHOR_EMAIL=git@au.thor.xz &&
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
doit() { doit() {
OFFSET=$1; shift OFFSET=$1 &&
NAME=$1; shift NAME=$2 &&
PARENTS= shift 2 &&
PARENTS= &&
for P for P
do do
PARENTS="${PARENTS}-p $P " PARENTS="${PARENTS}-p $P "
done done &&
GIT_COMMITTER_DATE="$(($M + $OFFSET)) $Z"
GIT_AUTHOR_DATE=$GIT_COMMITTER_DATE GIT_COMMITTER_DATE="$(($M + $OFFSET)) $Z" &&
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE GIT_AUTHOR_DATE=$GIT_COMMITTER_DATE &&
commit=$(echo $NAME | git commit-tree $T $PARENTS) export GIT_COMMITTER_DATE GIT_AUTHOR_DATE &&
echo $commit >.git/refs/tags/$NAME
commit=$(echo $NAME | git commit-tree $T $PARENTS) &&
echo $commit >.git/refs/tags/$NAME &&
echo $commit echo $commit
} }
'
test_expect_success 'set up G and H' '
# E---D---C---B---A # E---D---C---B---A
# \'-_ \ \ # \"-_ \ \
# \ `---------G \ # \ `---------G \
# \ \ # \ \
# F----------------H # F----------------H
E=$(doit 5 E) &&
# Setup... D=$(doit 4 D $E) &&
E=$(doit 5 E) F=$(doit 6 F $E) &&
D=$(doit 4 D $E) C=$(doit 3 C $D) &&
F=$(doit 6 F $E) B=$(doit 2 B $C) &&
C=$(doit 3 C $D) A=$(doit 1 A $B) &&
B=$(doit 2 B $C) G=$(doit 7 G $B $E) &&
A=$(doit 1 A $B)
G=$(doit 7 G $B $E)
H=$(doit 8 H $A $F) H=$(doit 8 H $A $F)
'
test_expect_success 'compute merge-base (single)' \ test_expect_success 'merge-base G H' '
'MB=$(git merge-base G H) && git name-rev $B >expected &&
expr "$(git name-rev "$MB")" : "[0-9a-f]* tags/B"'
test_expect_success 'compute merge-base (all)' \ MB=$(git merge-base G H) &&
'MB=$(git merge-base --all G H) && git name-rev "$MB" >actual.single &&
expr "$(git name-rev "$MB")" : "[0-9a-f]* tags/B"'
test_expect_success 'compute merge-base with show-branch' \ MB=$(git merge-base --all G H) &&
'MB=$(git show-branch --merge-base G H) && git name-rev "$MB" >actual.all &&
expr "$(git name-rev "$MB")" : "[0-9a-f]* tags/B"'
# Setup for second test to demonstrate that relying on timestamps in a MB=$(git show-branch --merge-base G H) &&
# distributed SCM to provide a _consistent_ partial ordering of commits git name-rev "$MB" >actual.sb &&
# leads to insanity.
test_cmp expected actual.single &&
test_cmp expected actual.all &&
test_cmp expected actual.sb
'
test_expect_success 'unsynchronized clocks' '
# This test is to demonstrate that relying on timestamps in a distributed
# SCM to provide a _consistent_ partial ordering of commits leads to
# insanity.
# #
# Relative # Relative
# Structure timestamps # Structure timestamps
@ -83,31 +96,36 @@ test_expect_success 'compute merge-base with show-branch' \
# The left and right chains of commits can be of any length and complexity as # The left and right chains of commits can be of any length and complexity as
# long as all of the timestamps are greater than that of S. # long as all of the timestamps are greater than that of S.
S=$(doit 0 S) S=$(doit 0 S) &&
C0=$(doit -3 C0 $S) C0=$(doit -3 C0 $S) &&
C1=$(doit -2 C1 $C0) C1=$(doit -2 C1 $C0) &&
C2=$(doit -1 C2 $C1) C2=$(doit -1 C2 $C1) &&
L0=$(doit 1 L0 $S) L0=$(doit 1 L0 $S) &&
L1=$(doit 2 L1 $L0) L1=$(doit 2 L1 $L0) &&
L2=$(doit 3 L2 $L1) L2=$(doit 3 L2 $L1) &&
R0=$(doit 1 R0 $S) R0=$(doit 1 R0 $S) &&
R1=$(doit 2 R1 $R0) R1=$(doit 2 R1 $R0) &&
R2=$(doit 3 R2 $R1) R2=$(doit 3 R2 $R1) &&
PL=$(doit 4 PL $L2 $C2) PL=$(doit 4 PL $L2 $C2) &&
PR=$(doit 4 PR $C2 $R2) PR=$(doit 4 PR $C2 $R2)
test_expect_success 'compute merge-base (single)' \ git name-rev $C2 >expected &&
'MB=$(git merge-base PL PR) &&
expr "$(git name-rev "$MB")" : "[0-9a-f]* tags/C2"'
test_expect_success 'compute merge-base (all)' \ MB=$(git merge-base PL PR) &&
'MB=$(git merge-base --all PL PR) && git name-rev "$MB" >actual.single &&
expr "$(git name-rev "$MB")" : "[0-9a-f]* tags/C2"'
MB=$(git merge-base --all PL PR) &&
git name-rev "$MB" >actual.all &&
test_cmp expected actual.single &&
test_cmp expected actual.all
'
test_expect_success 'merge-base for octopus-step (setup)' '
# Another set to demonstrate base between one commit and a merge # Another set to demonstrate base between one commit and a merge
# in the documentation. # in the documentation.
# #
@ -122,56 +140,55 @@ test_expect_success 'compute merge-base (all)' \
# |/ # |/
# * root (MMR) # * root (MMR)
test_commit MMR &&
test_expect_success 'merge-base for octopus-step (setup)' ' test_commit MM1 &&
test_tick && git commit --allow-empty -m root && git tag MMR && test_commit MM-o &&
test_tick && git commit --allow-empty -m 1 && git tag MM1 && test_commit MM-p &&
test_tick && git commit --allow-empty -m o && test_commit MM-q &&
test_tick && git commit --allow-empty -m o && test_commit MMA &&
test_tick && git commit --allow-empty -m o &&
test_tick && git commit --allow-empty -m A && git tag MMA &&
git checkout MM1 && git checkout MM1 &&
test_tick && git commit --allow-empty -m o && test_commit MM-r &&
test_tick && git commit --allow-empty -m o && test_commit MM-s &&
test_tick && git commit --allow-empty -m o && test_commit MM-t &&
test_tick && git commit --allow-empty -m B && git tag MMB && test_commit MMB &&
git checkout MMR && git checkout MMR &&
test_tick && git commit --allow-empty -m o && test_commit MM-u &&
test_tick && git commit --allow-empty -m o && test_commit MM-v &&
test_tick && git commit --allow-empty -m o && test_commit MM-w &&
test_tick && git commit --allow-empty -m o && test_commit MM-x &&
test_tick && git commit --allow-empty -m C && git tag MMC test_commit MMC
' '
test_expect_success 'merge-base A B C' ' test_expect_success 'merge-base A B C' '
MB=$(git merge-base --all MMA MMB MMC) && git rev-parse --verify MM1 >expected &&
MM1=$(git rev-parse --verify MM1) && git rev-parse --verify MMR >expected.sb &&
test "$MM1" = "$MB"
git merge-base --all MMA MMB MMC >actual &&
git show-branch --merge-base MMA MMB MMC >actual.sb &&
test_cmp expected actual &&
test_cmp expected.sb actual.sb
' '
test_expect_success 'merge-base A B C using show-branch' ' test_expect_success 'criss-cross merge-base for octopus-step' '
MB=$(git show-branch --merge-base MMA MMB MMC) &&
MMR=$(git rev-parse --verify MMR) &&
test "$MMR" = "$MB"
'
test_expect_success 'criss-cross merge-base for octopus-step (setup)' '
git reset --hard MMR && git reset --hard MMR &&
test_tick && git commit --allow-empty -m 1 && git tag CC1 && test_commit CC1 &&
git reset --hard E && git reset --hard E &&
test_tick && git commit --allow-empty -m 2 && git tag CC2 && test_commit CC2 &&
test_tick && git merge -s ours CC1 && test_tick &&
test_tick && git commit --allow-empty -m o && git merge -s ours CC1 &&
test_tick && git commit --allow-empty -m B && git tag CCB && test_commit CC-o &&
test_commit CCB &&
git reset --hard CC1 && git reset --hard CC1 &&
test_tick && git merge -s ours CC2 && git merge -s ours CC2 &&
test_tick && git commit --allow-empty -m A && git tag CCA test_commit CCA &&
'
test_expect_success 'merge-base B A^^ A^^2' ' git rev-parse CC1 CC2 >expected &&
MB0=$(git merge-base --all CCB CCA^^ CCA^^2 | sort) && git merge-base --all CCB CCA^^ CCA^^2 >actual &&
MB1=$(git rev-parse CC1 CC2 | sort) &&
test "$MB0" = "$MB1" sort expected >expected.sorted &&
sort actual >actual.sorted &&
test_cmp expected.sorted actual.sorted
' '
test_done test_done