tests: create gpg homedir on the fly

GnuPG 2.1 homedir looks different, so just create it on the fly by
importing needed private and public keys and ownertrust.

This solves an issue with gnupg 2.1 running interactive pinentry
when old secret key is present.

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:12 +01:00 committed by Junio C Hamano
parent 8213d87a83
commit b41a36e635
4 changed files with 11 additions and 3 deletions

View File

@ -16,11 +16,15 @@ else
# Type DSA and Elgamal, size 2048 bits, no expiration date. # Type DSA and Elgamal, size 2048 bits, no expiration date.
# Name and email: C O Mitter <committer@example.com> # Name and email: C O Mitter <committer@example.com>
# No password given, to enable non-interactive operation. # No password given, to enable non-interactive operation.
cp -R "$TEST_DIRECTORY"/lib-gpg ./gpghome mkdir ./gpghome
chmod 0700 gpghome chmod 0700 ./gpghome
chmod 0600 gpghome/*
GNUPGHOME="$(pwd)/gpghome" GNUPGHOME="$(pwd)/gpghome"
export GNUPGHOME export GNUPGHOME
gpg --homedir "${GNUPGHOME}" --import \
"$TEST_DIRECTORY"/lib-gpg/pubring.gpg \
"$TEST_DIRECTORY"/lib-gpg/secring.gpg
gpg --homedir "${GNUPGHOME}" --import-ownertrust \
"$TEST_DIRECTORY"/lib-gpg/ownertrust
test_set_prereq GPG test_set_prereq GPG
;; ;;
esac esac

4
t/lib-gpg/ownertrust Normal file
View File

@ -0,0 +1,4 @@
# List of assigned trustvalues, created Thu 11 Dec 2014 01:26:28 PM CET
# (Use "gpg --import-ownertrust" to restore them)
73D758744BE721698EC54E8713B6F51ECDDE430D:6:
D4BE22311AD3131E5EDA29A461092E85B7227189:3:

Binary file not shown.

Binary file not shown.