diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-08-25 18:33:22 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-08-25 18:33:48 -0700 |
| commit | b64d04c3d63d009ffeb801a128a39e3728ff9a99 (patch) | |
| tree | 0c4e73a92a3820e2477c793b0877decbc5f9a878 | |
| parent | ea382a289d3cd956492894da775ff4ef104f3852 (diff) | |
| download | emacs-b64d04c3d63d009ffeb801a128a39e3728ff9a99.tar.gz | |
Fix gpg2-related test failures on RHEL 7.8
* test/lisp/gnus/mml-sec-tests.el (test-conf)
(mml-secure-en-decrypt-passphrase-no-cache-openpgp-todo)
(mml-secure-run-tests-with-gpg2):
Use epg-find-configuration instead of the obsolescent
epg-configuration. This fixes test failures on RHEL 7.8,
where ‘gpg’ and ‘gpg2’ are both 2.0.22.
| -rw-r--r-- | test/lisp/gnus/mml-sec-tests.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el index 2924673b368..673fa6984a1 100644 --- a/test/lisp/gnus/mml-sec-tests.el +++ b/test/lisp/gnus/mml-sec-tests.el @@ -37,7 +37,7 @@ Mostly, the empty passphrase is used. However, the keys for as S/MIME).") (defun test-conf () - (ignore-errors (epg-configuration))) + (ignore-errors (epg-find-configuration 'OpenPGP))) (defun enc-standards () (if with-smime '(enc-pgp enc-pgp-mime enc-smime) @@ -843,7 +843,8 @@ So the second decryption fails." (ert-deftest mml-secure-en-decrypt-passphrase-no-cache-openpgp-todo () "Passphrase caching with OpenPGP only for GnuPG 1.x." (skip-unless (test-conf)) - (skip-unless (string< (cdr (assq 'version (epg-configuration))) "2")) + (skip-unless (string< (cdr (assq 'version (epg-find-configuration 'OpenPGP))) + "2")) (mml-secure-en-decrypt-passphrase-no-cache 'enc-pgp) (mml-secure-en-decrypt-passphrase-no-cache 'enc-pgp-mime)) @@ -885,7 +886,7 @@ So the second decryption fails." (defun mml-secure-run-tests-with-gpg2 () "Run all tests with gpg2 instead of gpg." (let* ((epg-gpg-program "gpg2"); ~/local/gnupg-2.1.9/PLAY/inst/bin/gpg2 - (gpg-version (cdr (assq 'version (epg-configuration)))) + (gpg-version (cdr (assq 'version (epg-find-configuration 'OpenPGP)))) ;; Empty passphrases do not seem to work with gpgsm in 2.1.x: ;; https://lists.gnupg.org/pipermail/gnupg-users/2015-October/054575.html (with-smime (string< gpg-version "2.1"))) |