Now that the notmuch client prefers gpg2 if available, having the test suite use the same preference makes it more likely to validate as expected. Be warned that the final test in T350-crypto.sh fails with an infinite loop in gpg if you're using an unpatched GnuPG 2.1.10, due to an upstream GnuPG bug: https://bugs.gnupg.org/gnupg/issue2187. In debian, this is resolved in 2.1.10-3 --- test/README | 2 +- test/T030-config.sh | 2 +- test/T040-setup.sh | 2 +- test/T350-crypto.sh | 16 ++++++++-------- test/test-lib.sh | 10 +++++++++- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/test/README b/test/README index e54e36b..9a7e539 100644 --- a/test/README +++ b/test/README @@ -16,7 +16,7 @@ that you know if you break anything. - emacs(1) - emacsclient(1) - gdb(1) - - gpg(1) + - gpg(1) or gpg2(1) - python(1) Running Tests diff --git a/test/T030-config.sh b/test/T030-config.sh index f404908..daa7b44 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -54,7 +54,7 @@ new.tags=unread;inbox; new.ignore= search.exclude_tags= maildir.synchronize_flags=true -crypto.gpg_path=gpg +crypto.gpg_path=$GPG foo.string=this is another string value foo.list=this;is another;list value;" diff --git a/test/T040-setup.sh b/test/T040-setup.sh index cf0c00b..9313aec 100755 --- a/test/T040-setup.sh +++ b/test/T040-setup.sh @@ -29,6 +29,6 @@ new.tags=foo;bar; new.ignore= search.exclude_tags=baz; maildir.synchronize_flags=true -crypto.gpg_path=gpg" +crypto.gpg_path=$GPG" test_done diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh index 3656cce..4bc15bc 100755 --- a/test/T350-crypto.sh +++ b/test/T350-crypto.sh @@ -12,11 +12,11 @@ add_gnupg_home () local output [ -d ${GNUPGHOME} ] && return mkdir -m 0700 "$GNUPGHOME" - gpg --no-tty --import <$TEST_DIRECTORY/gnupg-secret-key.asc >"$GNUPGHOME"/import.log 2>&1 + $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 + 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 + 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 @@ -26,7 +26,7 @@ add_gnupg_home () add_gnupg_home # get key fingerprint -FINGERPRINT=$(gpg --no-tty --list-secret-keys --with-colons --fingerprint | grep '^fpr:' | cut -d: -f10) +FINGERPRINT=$($GPG --no-tty --list-secret-keys --with-colons --fingerprint | grep '^fpr:' | cut -d: -f10) test_expect_success 'emacs delivery of signed message' \ 'emacs_fcc_message \ @@ -67,8 +67,8 @@ test_expect_equal_json \ test_begin_subtest "signature verification with full owner trust" # give the key full owner trust -echo "${FINGERPRINT}:6:" | gpg --no-tty --import-ownertrust >>"$GNUPGHOME"/trust.log 2>&1 -gpg --no-tty --check-trustdb >>"$GNUPGHOME"/trust.log 2>&1 +echo "${FINGERPRINT}:6:" | $GPG --no-tty --import-ownertrust >>"$GNUPGHOME"/trust.log 2>&1 +$GPG --no-tty --check-trustdb >>"$GNUPGHOME"/trust.log 2>&1 output=$(notmuch show --format=json --verify subject:"test signed message 001" \ | notmuch_json_show_sanitize \ | sed -e 's|"created": [1234567890]*|"created": 946728000|') @@ -325,8 +325,8 @@ Notmuch Test Suite key revocation (automated) $(date '+%F_%T%z') y " \ - | gpg --no-tty --quiet --command-fd 0 --armor --gen-revoke "0x${FINGERPRINT}!" 2>/dev/null \ - | gpg --no-tty --quiet --import + | $GPG --no-tty --quiet --command-fd 0 --armor --gen-revoke "0x${FINGERPRINT}!" 2>/dev/null \ + | $GPG --no-tty --quiet --import output=$(notmuch show --format=json --verify subject:"test signed message 001" \ | notmuch_json_show_sanitize \ | sed -e 's|"created": [1234567890]*|"created": 946728000|') diff --git a/test/test-lib.sh b/test/test-lib.sh index cc08a98..8c1f3c6 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -85,6 +85,13 @@ unset GREP_OPTIONS # For emacsclient unset ALTERNATE_EDITOR +# choose the preferred GnuPG binary: +if command -v gpg2 > /dev/null; then + GPG=gpg2 +else + GPG=gpg +fi + # Convenience # # A regexp to match 5 and 40 hexdigits @@ -1144,6 +1151,7 @@ test_emacs () { $load_emacs_tests \ --eval '(setq server-name \"$server_name\")' \ --eval '(server-start)' \ + --eval '(setq epg-gpg-program \"$GPG\")' \ --eval '(orphan-watchdog $$)'" || return EMACS_SERVER="$server_name" # wait until the emacs server is up @@ -1332,7 +1340,7 @@ test_declare_external_prereq dtach test_declare_external_prereq emacs test_declare_external_prereq ${TEST_EMACSCLIENT} test_declare_external_prereq gdb -test_declare_external_prereq gpg +test_declare_external_prereq gpg2 || test_declare_external_prereq gpg test_declare_external_prereq openssl test_declare_external_prereq gpgsm test_declare_external_prereq ${NOTMUCH_PYTHON} -- 2.7.0.rc3