From 1222ff5275e61e797d388489b8a88f499247321d Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Wed, 11 Jul 2018 20:01:11 -0400 Subject: [PATCH] Don't skip epg-tests even with gpg 2.0 (Bug#23561) * test/lisp/epg-tests.el (epg-tests--config-program-alist): New constant, which allows gpg2 version 2.0+. (epg-tests-find-usable-gpg-configuration): Pass it to epg-find-configuration. --- test/lisp/epg-tests.el | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el index 0fe15017dd0..7efe04bfc00 100644 --- a/test/lisp/epg-tests.el +++ b/test/lisp/epg-tests.el @@ -30,8 +30,19 @@ (expand-file-name "data/epg" (getenv "EMACS_TEST_DIRECTORY")) "Directory containing epg test data.") +(defconst epg-tests--config-program-alist + ;; The default `epg-config--program-alist' requires gpg2 2.1 or + ;; greater due to some practical problems with pinentry. But the + ;; tests here all work fine with 2.0 as well. + (let ((prog-alist (copy-sequence epg-config--program-alist))) + (setf (alist-get "gpg2" + (alist-get 'OpenPGP prog-alist) + nil nil #'equal) + "2.0") + prog-alist)) + (defun epg-tests-find-usable-gpg-configuration (&optional _require-passphrase) - (epg-find-configuration 'OpenPGP 'no-cache)) + (epg-find-configuration 'OpenPGP 'no-cache epg-tests--config-program-alist)) (defun epg-tests-passphrase-callback (_c _k _d) ;; Need to create a copy here, since the string will be wiped out -- 2.39.2