From 67b8a8abc33e694ca275dff3586b605a89f07c62 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Thu, 29 Jun 2017 23:28:15 -0400 Subject: [PATCH] Don't skip epg tests (Bug#23561) * test/lisp/epg-tests.el (with-epg-tests): Ignore REQUIRE-PASSPHRASE parameter, since we supply the passphrase via pinentry-program for all GPG versions (as of 2017-02-28 "Fix epg-tests with dummy-pinentry program (Bug#23619)"). (epg-tests-program-alist-for-passphrase-callback): Remove. --- test/lisp/epg-tests.el | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el index 9dd093e792..36db478801 100644 --- a/test/lisp/epg-tests.el +++ b/test/lisp/epg-tests.el @@ -30,17 +30,8 @@ (defvar epg-tests-data-directory (expand-file-name "data/epg" (getenv "EMACS_TEST_DIRECTORY")) "Directory containing epg test data.") -(defconst epg-tests-program-alist-for-passphrase-callback - '((OpenPGP - nil - ("gpg" . "1.4.3")))) - -(defun epg-tests-find-usable-gpg-configuration (&optional require-passphrase) - (epg-find-configuration - 'OpenPGP - 'no-cache - (if require-passphrase - epg-tests-program-alist-for-passphrase-callback))) +(defun epg-tests-find-usable-gpg-configuration (&optional _require-passphrase) + (epg-find-configuration 'OpenPGP 'no-cache)) (defun epg-tests-passphrase-callback (_c _k _d) ;; Need to create a copy here, since the string will be wiped out -- 2.11.1