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

tests: skip RFC1991 tests for gnupg 2.1

Browse Source 
GnuPG >= 2.1.0 no longer supports RFC1991, so skip these tests.

Signed-off-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Hesse 2014-12-12 09:50:13 +01:00 committed by Junio C Hamano
parent b41a36e635
commit c0e0ed6efe
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/lib-gpg.sh
View File

@ -26,6 +26,10 @@ else
gpg --homedir "${GNUPGHOME}" --import-ownertrust \ gpg --homedir "${GNUPGHOME}" --import-ownertrust \
"$TEST_DIRECTORY"/lib-gpg/ownertrust "$TEST_DIRECTORY"/lib-gpg/ownertrust
test_set_prereq GPG test_set_prereq GPG
if echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>&1
then
test_set_prereq RFC1991
fi
;; ;;
esac esac
fi fi

14
t/t7004-tag.sh
View File

@ -1081,7 +1081,7 @@ test_expect_success GPG \
get_tag_header rfc1991-signed-tag $commit commit $time >expect get_tag_header rfc1991-signed-tag $commit commit $time >expect
echo "RFC1991 signed tag" >>expect echo "RFC1991 signed tag" >>expect
echo '-----BEGIN PGP MESSAGE-----' >>expect echo '-----BEGIN PGP MESSAGE-----' >>expect
test_expect_success GPG \ test_expect_success GPG,RFC1991 \
'creating a signed tag with rfc1991' ' 'creating a signed tag with rfc1991' '
echo "rfc1991" >gpghome/gpg.conf && echo "rfc1991" >gpghome/gpg.conf &&
git tag -s -m "RFC1991 signed tag" rfc1991-signed-tag $commit && git tag -s -m "RFC1991 signed tag" rfc1991-signed-tag $commit &&
@ -1095,7 +1095,7 @@ cp "$1" actual
EOF EOF
chmod +x fakeeditor chmod +x fakeeditor
test_expect_success GPG \ test_expect_success GPG,RFC1991 \
'reediting a signed tag body omits signature' ' 'reediting a signed tag body omits signature' '
echo "rfc1991" >gpghome/gpg.conf && echo "rfc1991" >gpghome/gpg.conf &&
echo "RFC1991 signed tag" >expect && echo "RFC1991 signed tag" >expect &&
@ -1103,13 +1103,13 @@ test_expect_success GPG \
test_cmp expect actual test_cmp expect actual
' '
test_expect_success GPG \ test_expect_success GPG,RFC1991 \
'verifying rfc1991 signature' ' 'verifying rfc1991 signature' '
echo "rfc1991" >gpghome/gpg.conf && echo "rfc1991" >gpghome/gpg.conf &&
git tag -v rfc1991-signed-tag git tag -v rfc1991-signed-tag
' '
test_expect_success GPG \ test_expect_success GPG,RFC1991 \
'list tag with rfc1991 signature' ' 'list tag with rfc1991 signature' '
echo "rfc1991" >gpghome/gpg.conf && echo "rfc1991" >gpghome/gpg.conf &&
echo "rfc1991-signed-tag RFC1991 signed tag" >expect && echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
@ -1123,12 +1123,12 @@ test_expect_success GPG \
rm -f gpghome/gpg.conf rm -f gpghome/gpg.conf
test_expect_success GPG \ test_expect_success GPG,RFC1991 \
'verifying rfc1991 signature without --rfc1991' ' 'verifying rfc1991 signature without --rfc1991' '
git tag -v rfc1991-signed-tag git tag -v rfc1991-signed-tag
' '
test_expect_success GPG \ test_expect_success GPG,RFC1991 \
'list tag with rfc1991 signature without --rfc1991' ' 'list tag with rfc1991 signature without --rfc1991' '
echo "rfc1991-signed-tag RFC1991 signed tag" >expect && echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
git tag -l -n1 rfc1991-signed-tag >actual && git tag -l -n1 rfc1991-signed-tag >actual &&
@ -1139,7 +1139,7 @@ test_expect_success GPG \
test_cmp expect actual test_cmp expect actual
' '
test_expect_success GPG \ test_expect_success GPG,RFC1991 \
'reediting a signed tag body omits signature' ' 'reediting a signed tag body omits signature' '
echo "RFC1991 signed tag" >expect && echo "RFC1991 signed tag" >expect &&
GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit && GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit &&