diff options
Diffstat (limited to 'test/lisp/gnus')
| -rw-r--r-- | test/lisp/gnus/mml-sec-tests.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el index a6002b4d51e..e3a8c81cc65 100644 --- a/test/lisp/gnus/mml-sec-tests.el +++ b/test/lisp/gnus/mml-sec-tests.el @@ -432,6 +432,7 @@ In both cases, the first key is customized for signing and encryption." (ert-deftest mml-secure-select-preferred-keys-4 () "Multiple keys can be recorded per recipient or signature." (skip-unless (test-conf)) + (skip-unless (ignore-errors (epg-find-configuration 'CMS))) (mml-secure-test-fixture (lambda () (let ((pcontext (epg-make-context 'OpenPGP)) @@ -590,6 +591,7 @@ In this test, the single matching key is chosen automatically." "Encrypt message; then decrypt and test for expected result. In this test, the encryption key needs to fixed among multiple ones." (skip-unless (test-conf)) + (skip-unless (ignore-errors (epg-find-configuration 'CMS))) ;; sub@example.org with multiple candidate keys, ;; fixture customizes preferred ones. (mml-secure-test-key-fixture @@ -603,6 +605,7 @@ In this test, the encryption key needs to fixed among multiple ones." "Encrypt message; then decrypt and test for expected result. In this test, encrypt-to-self variables are set to t." (skip-unless (test-conf)) + (skip-unless (ignore-errors (epg-find-configuration 'CMS))) ;; sub@example.org with multiple candidate keys, ;; fixture customizes preferred ones. (mml-secure-test-key-fixture @@ -745,6 +748,7 @@ Use sign-with-sender and encrypt-to-self." (ert-deftest mml-secure-sign-verify-1 () "Sign message with sender; then verify and test for expected result." (skip-unless (test-conf)) + (skip-unless (ignore-errors (epg-find-configuration 'CMS))) (mml-secure-test-key-fixture (lambda () (dolist (method (sign-standards) nil) @@ -880,10 +884,12 @@ So the second decryption fails." (dolist (pid (list-system-processes)) (let ((atts (process-attributes pid))) (when (and (equal (cdr (assq 'user atts)) (user-login-name)) - (equal (cdr (assq 'comm atts)) "gpg-agent") + (or (equal (cdr (assq 'comm atts)) "gpg-agent") + (equal (cdr (assq 'comm atts)) "scdaemon")) (string-match (concat "homedir.*" - (regexp-quote (ert-resource-directory))) + (regexp-quote (directory-file-name + (ert-resource-directory)))) (cdr (assq 'args atts)))) (call-process "kill" nil nil nil (format "%d" pid)))))) |