From 5bf7da153e965b59e44ee0df77c589a9e0a8bacc Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 3 Dec 2019 16:48:18 -0500
Subject: email-print-mime-structure: Avoid test suite dependency on dirmngr

There is no clear reason why gpgsm should try to invoke dirmngr (see
https://dev.gnupg.org/T4765), but for now we can explicitly avoid the
checks.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
 debian/control                      | 1 -
 tests/email-print-mime-structure.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 3de5b11..bc8268a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends:
  bash-completion,
  debhelper (>= 10),
  dh-elpa,
- dirmngr <!nocheck>,
  gnutls-bin <!nocheck>,
  gpg <!nocheck>,
  gpg-agent <!nocheck>,
diff --git a/tests/email-print-mime-structure.sh b/tests/email-print-mime-structure.sh
index b45294e..dd14e44 100755
--- a/tests/email-print-mime-structure.sh
+++ b/tests/email-print-mime-structure.sh
@@ -30,7 +30,7 @@ for eml in tests/email-print-mime-structure/*.eml; do
 
         testgpghome=$(mktemp -d)
         printf "Testing %s (GnuPG S/MIME)\n" "${eml##*/}"
-        gpgsm --pinentry-mode=loopback --passphrase-fd 4 4<<<'' --homedir="$testgpghome" --batch --quiet --import <"$p12key"
+        gpgsm --disable-dirmngr --pinentry-mode=loopback --passphrase-fd 4 4<<<'' --homedir="$testgpghome" --batch --quiet --import <"$p12key"
         GNUPGHOME="$testgpghome" test_eml "$base" --use-gpg-agent
         rm -rf "$testgpghome"
     else
-- 
cgit v1.2.3