undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: avoid using test_i18ncmp

Browse Source 
Since `test_i18ncmp` was deprecated in v2.31.*, the instances added in
v2.30.9 needed to be converted to `test_cmp` calls.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin 2023-03-11 18:02:04 +01:00
parent b524e896b6
commit 92957d8427
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t0003-attributes.sh
View File

@ -344,7 +344,7 @@ test_expect_success 'large attributes line ignored in tree' '
printf "path %02043d" 1 >.gitattributes && printf "path %02043d" 1 >.gitattributes &&
git check-attr --all path >actual 2>err && git check-attr --all path >actual 2>err &&
echo "warning: ignoring overly long attributes line 1" >expect && echo "warning: ignoring overly long attributes line 1" >expect &&
test_i18ncmp expect err && test_cmp expect err &&
test_must_be_empty actual test_must_be_empty actual
' '
@ -357,7 +357,7 @@ test_expect_success 'large attributes line ignores trailing content in tree' '
printf "a %02045dtrailing attribute\n" 1 >.gitattributes && printf "a %02045dtrailing attribute\n" 1 >.gitattributes &&
git check-attr --all trailing >actual 2>err && git check-attr --all trailing >actual 2>err &&
echo "warning: ignoring overly long attributes line 1" >expect && echo "warning: ignoring overly long attributes line 1" >expect &&
test_i18ncmp expect err && test_cmp expect err &&
test_must_be_empty actual test_must_be_empty actual
' '
@ -366,7 +366,7 @@ test_expect_success EXPENSIVE 'large attributes file ignored in tree' '
dd if=/dev/zero of=.gitattributes bs=101M count=1 2>/dev/null && dd if=/dev/zero of=.gitattributes bs=101M count=1 2>/dev/null &&
git check-attr --all path >/dev/null 2>err && git check-attr --all path >/dev/null 2>err &&
echo "warning: ignoring overly large gitattributes file ${SQ}.gitattributes${SQ}" >expect && echo "warning: ignoring overly large gitattributes file ${SQ}.gitattributes${SQ}" >expect &&
test_i18ncmp expect err test_cmp expect err
' '
test_expect_success 'large attributes line ignored in index' ' test_expect_success 'large attributes line ignored in index' '
@ -375,7 +375,7 @@ test_expect_success 'large attributes line ignored in index' '
git update-index --add --cacheinfo 100644,$blob,.gitattributes && git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
git check-attr --cached --all path >actual 2>err && git check-attr --cached --all path >actual 2>err &&
echo "warning: ignoring overly long attributes line 1" >expect && echo "warning: ignoring overly long attributes line 1" >expect &&
test_i18ncmp expect err && test_cmp expect err &&
test_must_be_empty actual test_must_be_empty actual
' '
@ -385,7 +385,7 @@ test_expect_success 'large attributes line ignores trailing content in index' '
git update-index --add --cacheinfo 100644,$blob,.gitattributes && git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
git check-attr --cached --all trailing >actual 2>err && git check-attr --cached --all trailing >actual 2>err &&
echo "warning: ignoring overly long attributes line 1" >expect && echo "warning: ignoring overly long attributes line 1" >expect &&
test_i18ncmp expect err && test_cmp expect err &&
test_must_be_empty actual test_must_be_empty actual
' '

2
t/t4115-apply-symlink.sh
View File

@ -72,7 +72,7 @@ test_expect_success SYMLINKS 'symlink escape when creating new files' '
cat >expected_stderr <<-EOF && cat >expected_stderr <<-EOF &&
error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link
EOF EOF
test_i18ncmp expected_stderr stderr && test_cmp expected_stderr stderr &&
! test_path_exists .git/create-me ! test_path_exists .git/create-me
' '

6
t/t6300-for-each-ref.sh
View File

@ -945,9 +945,9 @@ test_failing_trailer_option () {
test_expect_success "$title" ' test_expect_success "$title" '
# error message cannot be checked under i18n # error message cannot be checked under i18n
test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual && test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
test_i18ncmp expect actual && test_cmp expect actual &&
test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual && test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
test_i18ncmp expect actual test_cmp expect actual
' '
} }
@ -966,7 +966,7 @@ test_expect_success 'if arguments, %(contents:trailers) shows error if colon is
fatal: unrecognized %(contents) argument: trailersonly fatal: unrecognized %(contents) argument: trailersonly
EOF EOF
test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual && test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
test_i18ncmp expect actual test_cmp expect actual
' '
test_expect_success 'basic atom: head contents:trailers' ' test_expect_success 'basic atom: head contents:trailers' '