From 652baa6fe6a93e401463e17a4ce6577efd3f7fea Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Thu, 2 May 2019 09:19:38 -0400 Subject: [PATCH] gmime-cleanup: tests should only care about gmime 3 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