diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2017-10-10 01:49:08 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-10-14 10:53:42 -0300 |
| commit | ee5df7d7db895a427aa1e4343b2c8f794a0b2d73 (patch) | |
| tree | 1232c3288964444ef309d03e42d1b39e57896114 /test | |
| parent | 30e33dfdd14bc65189d8561ce0022b9ffafad1c4 (diff) | |
tests: prepare for more crypto tests (using add_gnupg_home)
Move add_gnupg_home to test-lib.sh to prepare it for reuse.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T350-crypto.sh | 17 | ||||
| -rw-r--r-- | test/test-lib.sh | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh index 53bf4113..401a22c9 100755 --- a/test/T350-crypto.sh +++ b/test/T350-crypto.sh @@ -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 diff --git a/test/test-lib.sh b/test/test-lib.sh index 35024649..84051bc9 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -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... |