From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 26 Aug 2020 01:33:22 +0000 (-0700)
Subject: Fix gpg2-related test failures on RHEL 7.8
X-Git-Tag: emacs-28.0.90~6399
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b64d04c3d63d009ffeb801a128a39e3728ff9a99;p=emacs.git

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.
---

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")))