From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 25 Dec 2020 20:09:31 +0000 (+0100)
Subject: Skip some mml tests that rely on CMS if that's not installed
X-Git-Tag: emacs-28.0.90~4562
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9fb3474c9d596675d3ae53d7db59264424c7eb3;p=emacs.git

Skip some mml tests that rely on CMS if that's not installed
---

diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el
index 20d8e03c385..a144e2e4ffb 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)