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

t6019: modernize tests with helper

Browse Source 
The tests in t6019 are repetitive, so create a helper that greatly
simplifies the test script.

In addition, update the common pattern that places 'git rev-list' on the
left side of a pipe, which can hide some exit codes. Send the output to
a 'raw' file that is then consumed by other tools so the Git exit code
is verified as zero.  And since we're using --format anyway, switch to
`git log`, so that we get the desired format and can avoid using sed.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee
2022-08-19 04:28:09 +00:00
committed by Junio C Hamano
parent 11ea33ce44
commit 1838e21cff
1 changed files with 24 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
t/t6019-rev-list-ancestry-path.sh
View File

@ -50,73 +50,36 @@ test_expect_success setup '
test_commit M test_commit M
' '
test_expect_success 'rev-list D..M' ' test_ancestry () {
test_write_lines E F G H I J K L M >expect && args=$1
git rev-list --format=%s D..M | expected=$2
sed -e "/^commit /d" | test_expect_success "log $args" "
sort >actual && test_write_lines $expected >expect &&
test_cmp expect actual git log --format=%s $args >raw &&
'
test_expect_success 'rev-list --ancestry-path D..M' ' if test -n \"$expected\"
test_write_lines E F H I J L M >expect && then
git rev-list --ancestry-path --format=%s D..M | sort raw >actual &&
sed -e "/^commit /d" | test_cmp expect actual
sort >actual && else
test_cmp expect actual test_must_be_empty raw
' fi
"
}
test_expect_success 'rev-list D..M -- M.t' ' test_ancestry "D..M" "E F G H I J K L M"
echo M >expect &&
git rev-list --format=%s D..M -- M.t |
sed -e "/^commit /d" >actual &&
test_cmp expect actual
'
test_expect_success 'rev-list --ancestry-path D..M -- M.t' ' test_ancestry "--ancestry-path D..M" "E F H I J L M"
echo M >expect &&
git rev-list --ancestry-path --format=%s D..M -- M.t |
sed -e "/^commit /d" >actual &&
test_cmp expect actual
'
test_expect_success 'rev-list F...I' ' test_ancestry "D..M -- M.t" "M"
test_write_lines F G H I >expect && test_ancestry "--ancestry-path D..M -- M.t" "M"
git rev-list --format=%s F...I |
sed -e "/^commit /d" |
sort >actual &&
test_cmp expect actual
'
test_expect_success 'rev-list --ancestry-path F...I' ' test_ancestry "F...I" "F G H I"
test_write_lines F H I >expect && test_ancestry "--ancestry-path F...I" "F H I"
git rev-list --ancestry-path --format=%s F...I |
sed -e "/^commit /d" |
sort >actual &&
test_cmp expect actual
'
# G.t is dropped in an "-s ours" merge test_ancestry "G..M -- G.t" ""
test_expect_success 'rev-list G..M -- G.t' ' test_ancestry "--ancestry-path G..M -- G.t" "L"
git rev-list --format=%s G..M -- G.t | test_ancestry "--ancestry-path --simplify-merges G^..M -- G.t" "G L"
sed -e "/^commit /d" >actual &&
test_must_be_empty actual
'
test_expect_success 'rev-list --ancestry-path G..M -- G.t' '
echo L >expect &&
git rev-list --ancestry-path --format=%s G..M -- G.t |
sed -e "/^commit /d" >actual &&
test_cmp expect actual
'
test_expect_success 'rev-list --ancestry-path --simplify-merges G^..M -- G.t' '
test_write_lines G L >expect &&
git rev-list --ancestry-path --simplify-merges --format=%s G^..M -- G.t |
sed -e "/^commit /d" |
sort >actual &&
test_cmp expect actual
'
# b---bc # b---bc
# / \ / # / \ /