diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2017-06-29 23:28:15 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2017-07-06 19:54:07 -0400 |
| commit | 1eefada3f277e533cf74bc77ecd36f42c07a96cb (patch) | |
| tree | 1553242281f660c10791ac731d120c487dcf6269 | |
| parent | 386918f0b807116051facbe51a2bee342de37841 (diff) | |
| download | emacs-1eefada3f277e533cf74bc77ecd36f42c07a96cb.tar.gz emacs-1eefada3f277e533cf74bc77ecd36f42c07a96cb.tar.bz2 emacs-1eefada3f277e533cf74bc77ecd36f42c07a96cb.zip | |
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.
| -rw-r--r-- | test/lisp/epg-tests.el | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el index 9dd093e7927..36db4788011 100644 --- a/test/lisp/epg-tests.el +++ b/test/lisp/epg-tests.el @@ -30,17 +30,8 @@ (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 |