[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b64d04c: Fix gpg2-related test failures on RHEL 7.8
From: |
Paul Eggert |
Subject: |
master b64d04c: Fix gpg2-related test failures on RHEL 7.8 |
Date: |
Tue, 25 Aug 2020 21:33:54 -0400 (EDT) |
branch: master
commit b64d04c3d63d009ffeb801a128a39e3728ff9a99
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>
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.
---
test/lisp/gnus/mml-sec-tests.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el
index 2924673..673fa69 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")))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master b64d04c: Fix gpg2-related test failures on RHEL 7.8,
Paul Eggert <=