debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gmime-cleanup: tests should only care about gmime 3

Browse source 
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 <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor 2019-05-02 09:19:38 -04:00 committed by David Bremner
parent bb0b119358
commit 652baa6fe6
4 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/T190-multipart.sh
View file

@ -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_expect_equal_file "${MAIL_DIR}"/multipart OUTPUT
test_begin_subtest "--format=raw --part=1, message body" 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 notmuch show --format=raw --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
test_expect_equal_file multipart_body 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_expect_equal_file embedded_message OUTPUT
test_begin_subtest "--format=raw --part=4, rfc822's multipart" 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 notmuch show --format=raw --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
test_expect_equal_file embedded_message_body OUTPUT test_expect_equal_file embedded_message_body OUTPUT

2
test/T310-emacs.sh
View file

@ -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_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage-with-fourfold-indentation OUTPUT
test_begin_subtest "notmuch-show for message with invalid From" 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\"" \ add_message "[subject]=\"message-with-invalid-from\"" \
"[from]=\"\\\"Invalid \\\" From\\\" <test_suite@notmuchmail.org>\"" "[from]=\"\\\"Invalid \\\" From\\\" <test_suite@notmuchmail.org>\""
thread=$(notmuch search --output=threads subject:message-with-invalid-from) thread=$(notmuch search --output=threads subject:message-with-invalid-from)

2
test/T350-crypto.sh
View file

@ -136,7 +136,6 @@ test_expect_equal_json \
"$expected" "$expected"
test_begin_subtest "signature verification with full owner trust" test_begin_subtest "signature verification with full owner trust"
test_subtest_broken_gmime_2
# give the key full owner trust # give the key full owner trust
echo "${FINGERPRINT}:6:" | gpg --no-tty --import-ownertrust >>"$GNUPGHOME"/trust.log 2>&1 echo "${FINGERPRINT}:6:" | gpg --no-tty --import-ownertrust >>"$GNUPGHOME"/trust.log 2>&1
gpg --no-tty --check-trustdb >>"$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)"' "(mml-secure-message-sign-encrypt)"'
test_begin_subtest "decryption + signature verification" test_begin_subtest "decryption + signature verification"
test_subtest_broken_gmime_2
output=$(notmuch show --format=json --decrypt=true subject:"test encrypted message 002" \ output=$(notmuch show --format=json --decrypt=true subject:"test encrypted message 002" \
| notmuch_json_show_sanitize \ | notmuch_json_show_sanitize \
| sed -e 's|"created": [1234567890]*|"created": 946728000|') | sed -e 's|"created": [1234567890]*|"created": 946728000|')

16
test/test-lib.sh
View file

@ -1079,22 +1079,6 @@ TEST_DIRECTORY=$NOTMUCH_BUILDDIR/test
. "$NOTMUCH_SRCDIR/test/test-lib-common.sh" || exit 1 . "$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 emacs_generate_script