From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 9EFD66DE140C for ; Thu, 2 May 2019 06:19:55 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.145 X-Spam-Level: X-Spam-Status: No, score=-0.145 tagged_above=-999 required=5 tests=[AWL=0.056, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 07Wz9a8mT_KZ for ; Thu, 2 May 2019 06:19:55 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id 0E7576DE1326 for ; Thu, 2 May 2019 06:19:52 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1556803191; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=lLpFncU4DXKWFWljySxjE+0PeBMRqpLMsRms+IFs7p0=; b=AxcHSDckMgTPnkKYQ0SEtcYfwtki2fAZ07fwNT9ZCfeZtio1m9xx7dj2 TzDv0Vxw0fHsGgWsVp/6nnOROC/UAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1556803191; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=lLpFncU4DXKWFWljySxjE+0PeBMRqpLMsRms+IFs7p0=; b=uBuFZAXs3IUn1KULNuU5iFqnuMyCX0fboVhz/j6bRKMNJjjCcxTLdUnJ FH3SmMO3YWOuwz/nzNfIqP8/a6d0oiQS3NkS0ys9xkMLaOodhd9Su4TnE1 iznpz/fV0Ir5dRG7XGhZ0naAsmSIdBexCONIqB7RD5ora34ru8ePl+JEI+ fMfOSp/WphnQiDK5UVTzFv9A7NNyE90XKjBKqS2TJZ2DQkETYAP9eOxZZP im2lEJlcb6IFXq6y20Sr4F4r4/HmH9eoseGRGJ95GFB0ziQ27C7da3nbya rPREAkFCa8WwylC/naZbCXperGKDkJ+qhyOHiWa7T4CI2MvWLlf1Ug== Received: from fifthhorseman.net (ool-6c3a0662.static.optonline.net [108.58.6.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 1BCAAF9A5 for ; Thu, 2 May 2019 09:19:51 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id AFFE920C7B; Thu, 2 May 2019 09:19:47 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH v2 06/15] gmime-cleanup: tests should only care about gmime 3 Date: Thu, 2 May 2019 09:19:38 -0400 Message-Id: <20190502131947.16509-6-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502131947.16509-1-dkg@fifthhorseman.net> References: <20190502051653.8502-1-dkg@fifthhorseman.net> <20190502131947.16509-1-dkg@fifthhorseman.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 May 2019 13:19:55 -0000 note that "notmuch-show for message with invalid From" is still broken in T310-emacs.sh. It would be good to debug what's going on there and try to get it fixed! signed-off-by: Daniel Kahn Gillmor --- test/T190-multipart.sh | 2 -- test/T310-emacs.sh | 2 +- test/T350-crypto.sh | 2 -- test/test-lib.sh | 16 ---------------- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/test/T190-multipart.sh b/test/T190-multipart.sh index 9ad141cb..5cfa9d33 100755 --- a/test/T190-multipart.sh +++ b/test/T190-multipart.sh @@ -489,7 +489,6 @@ notmuch show --format=raw --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUT test_expect_equal_file "${MAIL_DIR}"/multipart OUTPUT test_begin_subtest "--format=raw --part=1, message body" -test_subtest_broken_gmime_2 notmuch show --format=raw --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT test_expect_equal_file multipart_body OUTPUT @@ -543,7 +542,6 @@ notmuch show --format=raw --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUT test_expect_equal_file embedded_message OUTPUT test_begin_subtest "--format=raw --part=4, rfc822's multipart" -test_subtest_broken_gmime_2 notmuch show --format=raw --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT test_expect_equal_file embedded_message_body OUTPUT diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh index cb9e99a5..c06a8133 100755 --- a/test/T310-emacs.sh +++ b/test/T310-emacs.sh @@ -86,7 +86,7 @@ test_emacs "(let ((notmuch-show-indent-messages-width 4)) test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage-with-fourfold-indentation OUTPUT test_begin_subtest "notmuch-show for message with invalid From" -test_subtest_broken_gmime_3 +test_subtest_known_broken add_message "[subject]=\"message-with-invalid-from\"" \ "[from]=\"\\\"Invalid \\\" From\\\" \"" thread=$(notmuch search --output=threads subject:message-with-invalid-from) diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh index 2f793e96..6045a7dc 100755 --- a/test/T350-crypto.sh +++ b/test/T350-crypto.sh @@ -136,7 +136,6 @@ test_expect_equal_json \ "$expected" test_begin_subtest "signature verification with full owner trust" -test_subtest_broken_gmime_2 # give the key full owner trust echo "${FINGERPRINT}:6:" | gpg --no-tty --import-ownertrust >>"$GNUPGHOME"/trust.log 2>&1 gpg --no-tty --check-trustdb >>"$GNUPGHOME"/trust.log 2>&1 @@ -347,7 +346,6 @@ test_expect_success \ "(mml-secure-message-sign-encrypt)"' test_begin_subtest "decryption + signature verification" -test_subtest_broken_gmime_2 output=$(notmuch show --format=json --decrypt=true subject:"test encrypted message 002" \ | notmuch_json_show_sanitize \ | sed -e 's|"created": [1234567890]*|"created": 946728000|') diff --git a/test/test-lib.sh b/test/test-lib.sh index 58909ee7..04d93f7d 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -1079,22 +1079,6 @@ TEST_DIRECTORY=$NOTMUCH_BUILDDIR/test . "$NOTMUCH_SRCDIR/test/test-lib-common.sh" || exit 1 -if [ "${NOTMUCH_GMIME_MAJOR}" = 3 ]; then - test_subtest_broken_gmime_3 () { - test_subtest_known_broken - } - test_subtest_broken_gmime_2 () { - true - } -else - test_subtest_broken_gmime_3 () { - true - } - test_subtest_broken_gmime_2 () { - test_subtest_known_broken - } -fi - emacs_generate_script -- 2.20.1