debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: prepare for more crypto tests (using add_gnupg_home)

Browse source 
Move add_gnupg_home to test-lib.sh to prepare it for reuse.
This commit is contained in:
Daniel Kahn Gillmor 2017-10-10 01:49:08 -04:00 committed by David Bremner
parent 30e33dfdd1
commit ee5df7d7db
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
test/T350-crypto.sh
View file

@ -7,23 +7,6 @@
test_description='PGP/MIME signature verification and decryption'
. ./test-lib.sh || exit 1
add_gnupg_home ()
{
local output
[ -d ${GNUPGHOME} ] && return
_gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }
at_exit_function _gnupg_exit
mkdir -m 0700 "$GNUPGHOME"
gpg --no-tty --import <$TEST_DIRECTORY/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
echo quick-random >> "$GNUPGHOME"/gpg.conf
elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then
echo debug-quick-random >> "$GNUPGHOME"/gpg.conf
fi
echo no-emit-version >> "$GNUPGHOME"/gpg.conf
}
##################################################
add_gnupg_home

17
test/test-lib.sh
View file

@ -93,6 +93,23 @@ unset GREP_OPTIONS
# For emacsclient
unset ALTERNATE_EDITOR
add_gnupg_home ()
{
local output
[ -d ${GNUPGHOME} ] && return
_gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }
at_exit_function _gnupg_exit
mkdir -m 0700 "$GNUPGHOME"
gpg --no-tty --import <$TEST_DIRECTORY/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
echo quick-random >> "$GNUPGHOME"/gpg.conf
elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then
echo debug-quick-random >> "$GNUPGHOME"/gpg.conf
fi
echo no-emit-version >> "$GNUPGHOME"/gpg.conf
}
# Each test should start with something like this, after copyright notices:
#
# test_description='Description of this test...