mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
Merge branch 'fs/gpg-unknown-key-test-fix'
Test simplification. * fs/gpg-unknown-key-test-fix: t/gpg: simplify test for unknown key
This commit is contained in:
commit
83ca08298e
|
@ -71,25 +71,7 @@ test_expect_success GPG 'create signed commits' '
|
||||||
git tag eleventh-signed $(cat oid) &&
|
git tag eleventh-signed $(cat oid) &&
|
||||||
echo 12 | git commit-tree --gpg-sign=B7227189 HEAD^{tree} >oid &&
|
echo 12 | git commit-tree --gpg-sign=B7227189 HEAD^{tree} >oid &&
|
||||||
test_line_count = 1 oid &&
|
test_line_count = 1 oid &&
|
||||||
git tag twelfth-signed-alt $(cat oid) &&
|
git tag twelfth-signed-alt $(cat oid)
|
||||||
|
|
||||||
cat >keydetails <<-\EOF &&
|
|
||||||
Key-Type: RSA
|
|
||||||
Key-Length: 2048
|
|
||||||
Subkey-Type: RSA
|
|
||||||
Subkey-Length: 2048
|
|
||||||
Name-Real: Unknown User
|
|
||||||
Name-Email: unknown@git.com
|
|
||||||
Expire-Date: 0
|
|
||||||
%no-ask-passphrase
|
|
||||||
%no-protection
|
|
||||||
EOF
|
|
||||||
gpg --batch --gen-key keydetails &&
|
|
||||||
echo 13 >file && git commit -a -S"unknown@git.com" -m thirteenth &&
|
|
||||||
git tag thirteenth-signed &&
|
|
||||||
DELETE_FINGERPRINT=$(gpg -K --with-colons --fingerprint --batch unknown@git.com | grep "^fpr" | head -n 1 | awk -F ":" "{print \$10;}") &&
|
|
||||||
gpg --batch --yes --delete-secret-keys $DELETE_FINGERPRINT &&
|
|
||||||
gpg --batch --yes --delete-keys unknown@git.com
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success GPG 'verify and show signatures' '
|
test_expect_success GPG 'verify and show signatures' '
|
||||||
|
@ -129,7 +111,7 @@ test_expect_success GPG 'verify and show signatures' '
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success GPG 'verify-commit exits failure on unknown signature' '
|
test_expect_success GPG 'verify-commit exits failure on unknown signature' '
|
||||||
test_must_fail git verify-commit thirteenth-signed 2>actual &&
|
test_must_fail env GNUPGHOME="$GNUPGHOME_NOT_USED" git verify-commit initial 2>actual &&
|
||||||
! grep "Good signature from" actual &&
|
! grep "Good signature from" actual &&
|
||||||
! grep "BAD signature from" actual &&
|
! grep "BAD signature from" actual &&
|
||||||
grep -q -F -e "No public key" -e "public key not found" actual
|
grep -q -F -e "No public key" -e "public key not found" actual
|
||||||
|
|
Loading…
Reference in a new issue