diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2020-04-30 15:34:21 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-04-30 17:54:58 -0300 |
| commit | 51c43d0e925486b2c7b9a708ba9aebc22dde57a6 (patch) | |
| tree | 1d3ef1e5c543cdbb5ecf05874d0cac31e4372e89 | |
| parent | 7eaac52ddbb7c95b7e92c24d84eecdb3e9691021 (diff) | |
test: Allow tests to have both gpg and gpgsm active at once
Without this fix, we couldn't run both add_gnupg_home and
add_gpgsm_home in the same test script.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
| -rw-r--r-- | test/test-lib.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index ac1b9315..1baa2d20 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -110,10 +110,10 @@ unset ALTERNATE_EDITOR add_gnupg_home () { local output - [ -d ${GNUPGHOME} ] && return + [ -e "${GNUPGHOME}/gpg.conf" ] && return _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; } at_exit_function _gnupg_exit - mkdir -m 0700 "$GNUPGHOME" + mkdir -p -m 0700 "$GNUPGHOME" gpg --no-tty --import <$NOTMUCH_SRCDIR/test/gnupg-secret-key.asc >"$GNUPGHOME"/import.log 2>&1 test_debug "cat $GNUPGHOME/import.log" if (gpg --quick-random --version >/dev/null 2>&1) ; then @@ -132,10 +132,10 @@ add_gnupg_home () add_gpgsm_home () { local fpr - [ -d "$GNUPGHOME" ] && return + [ -e "$GNUPGHOME/gpgsm.conf" ] && return _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; } at_exit_function _gnupg_exit - mkdir -m 0700 "$GNUPGHOME" + mkdir -p -m 0700 "$GNUPGHOME" openssl pkcs12 -export -passout pass: -inkey "$NOTMUCH_SRCDIR/test/smime/key+cert.pem" \ < "$NOTMUCH_SRCDIR/test/smime/test.crt" | \ gpgsm --batch --no-tty --no-common-certs-import --pinentry-mode=loopback --passphrase-fd 3 \ |