From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0r.migadu.com with LMTPS id gKUOIbBBjWBgYgEALuJCtg (envelope-from ) for ; Sat, 01 May 2021 13:55:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id gHTGHLBBjWCdagAAbx9fmQ (envelope-from ) for ; Sat, 01 May 2021 11:55:28 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 049AF10BAC for ; Sat, 1 May 2021 13:55:28 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 7018B27DE4; Sat, 1 May 2021 07:54:53 -0400 (EDT) Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by mail.notmuchmail.org (Postfix) with ESMTPS id 43E0E271E0 for ; Sat, 1 May 2021 07:54:37 -0400 (EDT) Received: by mail-ot1-x335.google.com with SMTP id x54-20020a05683040b6b02902a527443e2fso927557ott.1 for ; Sat, 01 May 2021 04:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M395vVJX/5k8VPQsH9jA2QZWKv5p4f828RUH7IzGthM=; b=smeXOaYSlTswZdg/NkQFjnm9y7I/8dg0xjS+Ut6zhvV5WPzcigMDp+8BDhMsKKMCrI vWLQ4BKUJ8OMLMXg+0nNw23MrXx8zM7kShtOsId1oRy4nufLj7ojsRCZtMeWdRbn9BlA V6JEvsZkDR/kSf2w0fF/WQzEbG/MVdyFV9chusmK4hSGcdjw5AjpYpX1Lnx6WOKLeEtT fSPn6z6YHzX8eKGK9fCs41VgSUSVwsco5nqZFhjJfRd/fZKhPNI7n7YUe9JBRHfBGqBJ K+DIkCqGeatYGfwDR/Lzl/pR8qdTA21Ygu/3+RJAmDCwn/DZLPVtNUFONRlk9YHl9kfB uECA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M395vVJX/5k8VPQsH9jA2QZWKv5p4f828RUH7IzGthM=; b=Zj4m/4uL9LekRixigKWc8iG102jTZopP2ALBELsiEG02ir+wUNYl3Znw/jxb57aliT UOIBNzC5p0aVFkXHYCMdZohRXbKHDCBcLpOTPZWV6h81Da0VB3Sv2+K4u3UzGAVX1olt u6wKyn1oAz2jrjTZ1qfIaj/cNLNspnqQnCDEyzpUaqyyORPOBMtVvfouAENkIyFYkzVZ G8p6tTih0GOHzf3a6TOd+eIKBiNMWvRQVNo8bL1mq/kSxPmOhYU3k9UzQwR6DOGK5/XJ 3M6fMvqsVCbJuNMTRYd+s2qXplJFL2uxaVCS6sR4pR/26WnHMN0HqNYDxRwUYzq7qWBk 9Auw== X-Gm-Message-State: AOAM531+uwKFKQtZOF1cMERwGYf9236sL5+9O5PA6VcMOLc3K0+w5R61 fkWE2UL+xVDHHiaCl3FjSsXt0P0BCzAgCQ== X-Google-Smtp-Source: ABdhPJwf/OCUzkL63NlRZ4sv1wva/1MEuw+wvAsfWDudRA/vygGfbaiIRl40z5eXbuSvOyJb0/x9Rg== X-Received: by 2002:a05:6830:30bc:: with SMTP id g28mr4822035ots.43.1619870075545; Sat, 01 May 2021 04:54:35 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id f20sm1472135oov.21.2021.05.01.04.54.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 04:54:35 -0700 (PDT) From: Felipe Contreras To: notmuch@notmuchmail.org Subject: [PATCH 07/13] test: add external prereqs to many emacs tests Date: Sat, 1 May 2021 06:54:16 -0500 Message-Id: <20210501115422.483314-8-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210501115422.483314-1-felipe.contreras@gmail.com> References: <20210501115422.483314-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Message-ID-Hash: S7OICOEBNF5AOIOISTRYOGXCM3N2V7VR X-Message-ID-Hash: S7OICOEBNF5AOIOISTRYOGXCM3N2V7VR X-MailFrom: felipe.contreras@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Daniel Kahn Gillmor X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1619870128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=HRziOe4BZ9q2aG0t5d3dz6kbbktV0crXLjOfxNY8mQ0=; b=Cb3hSM2HILwm/s6Yzn4z0rNVI/zxuwwxoboBjZw+oYefQR3npWo5g74H7+n6tWXEelrji/ oghGFFAuXeOmAZpNVRjpCxw1q4ADxubaUuTjuHoyugO9Z06r6UNRMbZFMopdUaKBOVIz8F tBZmLGUX3iZce7pHqTRcZK2gA54RkmjX0rJCHpPmMd8lm5U0gaVENOsky3dbXQ5YhcacHp XCwR+xxPM8e3obdNal4swDVZ9V7h9/LWlqgn+jKfMMAsUQOx/0O4TD/6CLoN//yZh46mcq czTJl2zX4vkXX/orjdKOCDt+Vp0OYB6CD2sCr9dQYriE/d2uF8yo0ZZSObAK3A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1619870128; a=rsa-sha256; cv=none; b=ZgGa0vbNq/MargccP1KDLeCcdDsgfoYeHIKZx85oUKqhf/WRqLgGOJ8zkIDJtmdHODDsTJ Y70IyQ3f6syayQFdKCzzVF9jYI1vYQkHgj55zOZe7LqNdfsk6Ez9GqbPgV5TrGi+K9BtAr 30G4/0V2gjbmLGsoYjJlvcVg2IArIkmBZGy9BwLN2rFB82zKj5ojIndQiwrZSWICw2k7bR c/Dv+6VIZb11cX8qCPV3AzrdhqcqUNuejG+4xzimQCtD0Zzu0p5siUcgQHMPUCMU7PQbBg yIaZ2KQIeT66Oo3CGLHZDwpt1VftNfQZGwzgFKjGy7q4pqXfpbXqccF1sr5yeA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=smeXOaYS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.96 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=smeXOaYS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 049AF10BAC X-Spam-Score: -0.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: X8rcXRbydrfL The tests fail otherwise. Signed-off-by: Felipe Contreras --- test/T310-emacs.sh | 1 + test/T350-crypto.sh | 1 + test/T355-smime.sh | 1 + test/T357-index-decryption.sh | 1 + test/T450-emacs-show.sh | 1 + test/T460-emacs-tree.sh | 1 + test/T730-emacs-forwarding.sh | 2 ++ test/test-lib.sh | 6 ++++++ 8 files changed, 14 insertions(+) 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 -- 2.31.0