aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2021-05-01 06:54:16 -0500
committerDavid Bremner <david@tethera.net>2021-05-01 21:15:27 -0300
commitfe9616aef19a1584de550ea536dfc7b42a13636a (patch)
treea73de836013bb5a783f14aca13d7a04b014de692 /test
parent049a652da7a692704348085a817b0086a44d5435 (diff)
test: add external prereqs to many emacs tests
The tests fail otherwise. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Diffstat (limited to 'test')
-rwxr-xr-xtest/T310-emacs.sh1
-rwxr-xr-xtest/T350-crypto.sh1
-rwxr-xr-xtest/T355-smime.sh1
-rwxr-xr-xtest/T357-index-decryption.sh1
-rwxr-xr-xtest/T450-emacs-show.sh1
-rwxr-xr-xtest/T460-emacs-tree.sh1
-rwxr-xr-xtest/T730-emacs-forwarding.sh2
-rw-r--r--test/test-lib.sh6
8 files changed, 14 insertions, 0 deletions
diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index 78ac19a8..e64627c6 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -5,6 +5,7 @@ test_description="emacs interface"
EXPECTED=$NOTMUCH_SRCDIR/test/emacs.expected-output
+test_require_emacs
add_email_corpus
# syntax errors in test-lib.el cause mysterious failures
diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh
index 0aada4df..ae1d6a98 100755
--- a/test/T350-crypto.sh
+++ b/test/T350-crypto.sh
@@ -9,6 +9,7 @@ test_description='PGP/MIME signature verification and decryption'
##################################################
+test_require_emacs
add_gnupg_home
test_begin_subtest "emacs delivery of signed message"
diff --git a/test/T355-smime.sh b/test/T355-smime.sh
index 8b2b52be..12ac2525 100755
--- a/test/T355-smime.sh
+++ b/test/T355-smime.sh
@@ -3,6 +3,7 @@
test_description='S/MIME signature verification and decryption'
. $(dirname "$0")/test-lib.sh || exit 1
+test_require_emacs
test_require_external_prereq openssl
test_require_external_prereq gpgsm
diff --git a/test/T357-index-decryption.sh b/test/T357-index-decryption.sh
index 1ed5f28c..b81bdfe1 100755
--- a/test/T357-index-decryption.sh
+++ b/test/T357-index-decryption.sh
@@ -7,6 +7,7 @@ test_description='indexing decrypted mail'
##################################################
+test_require_emacs
add_gnupg_home
# create a test encrypted message
diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
index cca56ca3..bd76d378 100755
--- a/test/T450-emacs-show.sh
+++ b/test/T450-emacs-show.sh
@@ -5,6 +5,7 @@ test_description="emacs notmuch-show view"
EXPECTED=$NOTMUCH_SRCDIR/test/emacs-show.expected-output
+test_require_emacs
add_email_corpus
test_begin_subtest "Hiding Original Message region at beginning of a message"
diff --git a/test/T460-emacs-tree.sh b/test/T460-emacs-tree.sh
index cb2c90b8..195485c1 100755
--- a/test/T460-emacs-tree.sh
+++ b/test/T460-emacs-tree.sh
@@ -5,6 +5,7 @@ test_description="emacs tree view interface"
EXPECTED=$NOTMUCH_SRCDIR/test/emacs-tree.expected-output
+test_require_emacs
add_email_corpus
test_begin_subtest "Basic notmuch-tree view in emacs"
diff --git a/test/T730-emacs-forwarding.sh b/test/T730-emacs-forwarding.sh
index 45e61568..5d6ac9f0 100755
--- a/test/T730-emacs-forwarding.sh
+++ b/test/T730-emacs-forwarding.sh
@@ -3,6 +3,8 @@
test_description="emacs forwarding"
. $(dirname "$0")/test-lib.sh || exit 1
+test_require_emacs
+
test_begin_subtest "Forward setting the correct references header"
# Check that, when forwarding a message, the new message has
# a References-header pointing to the original (forwarded) message.
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 72ac2e89..88e2a82f 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -114,6 +114,12 @@ unset ALTERNATE_EDITOR
unset EMAIL
unset NAME
+test_require_emacs () {
+ test_require_external_prereq emacs
+ test_require_external_prereq ${TEST_EMACSCLIENT}
+ test_require_external_prereq dtach
+}
+
add_gnupg_home ()
{
[ -e "${GNUPGHOME}/gpg.conf" ] && return