diff options
| author | Christian Hesse <mail@eworm.de> | 2014-12-12 09:50:12 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-12 10:23:36 -0800 |
| commit | b41a36e635803f1dc011007e836ae244f9ae04c1 (patch) | |
| tree | d11e27b12de54bc23c5d9e1f343accd1168b7f78 | |
| parent | 8213d87a83867809f490e8d683ebbaa857547189 (diff) | |
| download | git-b41a36e635803f1dc011007e836ae244f9ae04c1.tar.gz | |
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>
| -rwxr-xr-x | t/lib-gpg.sh | 10 | ||||
| -rw-r--r-- | t/lib-gpg/ownertrust | 4 | ||||
| -rw-r--r-- | t/lib-gpg/random_seed | bin | 600 -> 0 bytes | |||
| -rw-r--r-- | t/lib-gpg/trustdb.gpg | bin | 1360 -> 0 bytes |
4 files changed, 11 insertions, 3 deletions
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index cd2baef383..4e57942b35 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -16,11 +16,15 @@ else # Type DSA and Elgamal, size 2048 bits, no expiration date. # Name and email: C O Mitter <committer@example.com> # No password given, to enable non-interactive operation. - cp -R "$TEST_DIRECTORY"/lib-gpg ./gpghome - chmod 0700 gpghome - chmod 0600 gpghome/* + mkdir ./gpghome + chmod 0700 ./gpghome GNUPGHOME="$(pwd)/gpghome" 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 ;; esac diff --git a/t/lib-gpg/ownertrust b/t/lib-gpg/ownertrust new file mode 100644 index 0000000000..b3e3c4f1cd --- /dev/null +++ b/t/lib-gpg/ownertrust @@ -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: diff --git a/t/lib-gpg/random_seed b/t/lib-gpg/random_seed Binary files differdeleted file mode 100644 index 95d249f15f..0000000000 --- a/t/lib-gpg/random_seed +++ /dev/null diff --git a/t/lib-gpg/trustdb.gpg b/t/lib-gpg/trustdb.gpg Binary files differdeleted file mode 100644 index 4879ae9a84..0000000000 --- a/t/lib-gpg/trustdb.gpg +++ /dev/null |