From 366f3069ae23b5252331a758a7f0bed293563bb5 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Wed, 15 Feb 2012 09:03:37 +0000 Subject: [PATCH] [RFC PATCH v5 09/11] test: update tests to reflect the exclude flag --- 9d/0c96fd4ff89fec822746fc7f622be00e732df2 | 356 ++++++++++++++++++++++ 1 file changed, 356 insertions(+) create mode 100644 9d/0c96fd4ff89fec822746fc7f622be00e732df2 diff --git a/9d/0c96fd4ff89fec822746fc7f622be00e732df2 b/9d/0c96fd4ff89fec822746fc7f622be00e732df2 new file mode 100644 index 000000000..fdb5eab01 --- /dev/null +++ b/9d/0c96fd4ff89fec822746fc7f622be00e732df2 @@ -0,0 +1,356 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id C186941ED91 + for ; Wed, 15 Feb 2012 01:03:23 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.202 +X-Spam-Level: +X-Spam-Status: No, score=0.202 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + NORMAL_HTTP_TO_IP=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id fNkQFfbx3BEO for ; + Wed, 15 Feb 2012 01:03:18 -0800 (PST) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 4CED641ED7C + for ; Wed, 15 Feb 2012 01:03:16 -0800 (PST) +Received: by mail-we0-f181.google.com with SMTP id p13so603332wer.26 + for ; Wed, 15 Feb 2012 01:03:16 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references + :mime-version:content-type:content-transfer-encoding; + bh=BoqCjvH/qrRodiooalUu9qeE1gyUo9xNYwfwn6Gk3Xo=; + b=XtYsqWyyjTGbPLgRG4L38LXpWhEkSQ7tSc/m5DReox2C10D0rybus3M0NxqElFbzX8 + CFm2ihMy1RxSBviXK6ylSeYf+i7DdCi+zXOt/fYdUVPJ9eyEmoq/ygvgPYQHeMIrYuok + Ya+FQpV7naIL67JbcW6sEiAjnxvi1uYrG6h0M= +Received: by 10.180.90.212 with SMTP id by20mr34440570wib.12.1329296595987; + Wed, 15 Feb 2012 01:03:15 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + ft8sm32090148wib.11.2012.02.15.01.03.14 (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 15 Feb 2012 01:03:15 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [RFC PATCH v5 09/11] test: update tests to reflect the exclude flag +Date: Wed, 15 Feb 2012 09:03:37 +0000 +Message-Id: <1329296619-7463-10-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <1329296619-7463-1-git-send-email-markwalters1009@gmail.com> +References: <1329296619-7463-1-git-send-email-markwalters1009@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Wed, 15 Feb 2012 09:03:24 -0000 + +notmuch show outputs the exclude flag so many tests using notmuch +show failed. This commit adds "excluded:0" or "excluded: false" to +the expected outputs. After this commit there should be no failing +tests. +--- + test/crypto | 9 ++++++++- + test/encoding | 2 +- + test/json | 6 +++--- + test/maildir-sync | 1 + + test/multipart | 4 ++-- + test/thread-naming | 16 ++++++++-------- + 6 files changed, 23 insertions(+), 15 deletions(-) + +diff --git a/test/crypto b/test/crypto +index 1dbb60a..564cf9a 100755 +--- a/test/crypto ++++ b/test/crypto +@@ -43,6 +43,7 @@ output=$(notmuch show --format=json --verify subject:"test signed message 001" \ + | sed -e 's|"created": [1234567890]*|"created": 946728000|') + expected='[[[{"id": "XXXXX", + "match": true, ++ "excluded": false, + "filename": "YYYYY", + "timestamp": 946728000, + "date_relative": "2000-01-01", +@@ -77,6 +78,7 @@ output=$(notmuch show --format=json --verify subject:"test signed message 001" \ + | sed -e 's|"created": [1234567890]*|"created": 946728000|') + expected='[[[{"id": "XXXXX", + "match": true, ++ "excluded": false, + "filename": "YYYYY", + "timestamp": 946728000, + "date_relative": "2000-01-01", +@@ -113,6 +115,7 @@ output=$(notmuch show --format=json --verify subject:"test signed message 001" \ + | sed -e 's|"created": [1234567890]*|"created": 946728000|') + expected='[[[{"id": "XXXXX", + "match": true, ++ "excluded": false, + "filename": "YYYYY", + "timestamp": 946728000, + "date_relative": "2000-01-01", +@@ -153,7 +156,7 @@ test_begin_subtest "decryption, --format=text" + output=$(notmuch show --format=text --decrypt subject:"test encrypted message 001" \ + | notmuch_show_sanitize_all \ + | sed -e 's|"created": [1234567890]*|"created": 946728000|') +-expected=' +message{ id:XXXXX depth:0 match:1 filename:XXXXX ++expected=' +message{ id:XXXXX depth:0 match:1 excluded:0 filename:XXXXX + +header{ + Notmuch Test Suite (2000-01-01) (encrypted inbox) + Subject: test encrypted message 001 +@@ -187,6 +190,7 @@ output=$(notmuch show --format=json --decrypt subject:"test encrypted message 00 + | sed -e 's|"created": [1234567890]*|"created": 946728000|') + expected='[[[{"id": "XXXXX", + "match": true, ++ "excluded": false, + "filename": "YYYYY", + "timestamp": 946728000, + "date_relative": "2000-01-01", +@@ -242,6 +246,7 @@ output=$(notmuch show --format=json --decrypt subject:"test encrypted message 00 + | sed -e 's|"created": [1234567890]*|"created": 946728000|') + expected='[[[{"id": "XXXXX", + "match": true, ++ "excluded": false, + "filename": "YYYYY", + "timestamp": 946728000, + "date_relative": "2000-01-01", +@@ -277,6 +282,7 @@ output=$(notmuch show --format=json --decrypt subject:"test encrypted message 00 + | sed -e 's|"created": [1234567890]*|"created": 946728000|') + expected='[[[{"id": "XXXXX", + "match": true, ++ "excluded": false, + "filename": "YYYYY", + "timestamp": 946728000, + "date_relative": "2000-01-01", +@@ -332,6 +338,7 @@ output=$(notmuch show --format=json --verify subject:"test signed message 001" \ + | sed -e 's|"created": [1234567890]*|"created": 946728000|') + expected='[[[{"id": "XXXXX", + "match": true, ++ "excluded": false, + "filename": "YYYYY", + "timestamp": 946728000, + "date_relative": "2000-01-01", +diff --git a/test/encoding b/test/encoding +index 33259c1..a872345 100755 +--- a/test/encoding ++++ b/test/encoding +@@ -6,7 +6,7 @@ test_begin_subtest "Message with text of unknown charset" + add_message '[content-type]="text/plain; charset=unknown-8bit"' \ + "[body]=irrelevant" + output=$(notmuch show id:${gen_msg_id} 2>&1 | notmuch_show_sanitize) +-test_expect_equal "$output" " +message{ id:msg-001@notmuch-test-suite depth:0 match:1 filename:/XXX/mail/msg-001 ++test_expect_equal "$output" " +message{ id:msg-001@notmuch-test-suite depth:0 match:1 excluded:0 filename:/XXX/mail/msg-001 + +header{ + Notmuch Test Suite (2001-01-05) (inbox unread) + Subject: Test message #1 +diff --git a/test/json b/test/json +index 7df4380..f95fcf8 100755 +--- a/test/json ++++ b/test/json +@@ -5,7 +5,7 @@ test_description="--format=json output" + test_begin_subtest "Show message: json" + add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-show-message\"" + output=$(notmuch show --format=json "json-show-message") +-test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite \", \"To\": \"Notmuch Test Suite \", \"Cc\": \"\", \"Bcc\": \"\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 -0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]" ++test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite \", \"To\": \"Notmuch Test Suite \", \"Cc\": \"\", \"Bcc\": \"\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 -0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]" + + test_begin_subtest "Search message: json" + add_message "[subject]=\"json-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-search-message\"" +@@ -22,7 +22,7 @@ test_expect_equal "$output" "[{\"thread\": \"XXX\", + test_begin_subtest "Show message: json, utf-8" + add_message "[subject]=\"json-show-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-show-méssage\"" + output=$(notmuch show --format=json "jsön-show-méssage") +-test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-utf8-body-sübjéct\", \"From\": \"Notmuch Test Suite \", \"To\": \"Notmuch Test Suite \", \"Cc\": \"\", \"Bcc\": \"\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 -0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"jsön-show-méssage\n\"}]}, []]]]" ++test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-utf8-body-sübjéct\", \"From\": \"Notmuch Test Suite \", \"To\": \"Notmuch Test Suite \", \"Cc\": \"\", \"Bcc\": \"\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 -0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"jsön-show-méssage\n\"}]}, []]]]" + + test_begin_subtest "Show message: json, inline attachment filename" + subject='json-show-inline-attachment-filename' +@@ -35,7 +35,7 @@ emacs_deliver_message \ + (insert \"Message-ID: <$id>\n\")" + output=$(notmuch show --format=json "id:$id") + filename=$(notmuch search --output=files "id:$id") +-test_expect_equal "$output" "[[[{\"id\": \"$id\", \"match\": true, \"filename\": \"$filename\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\"], \"headers\": {\"Subject\": \"$subject\", \"From\": \"Notmuch Test Suite \", \"To\": \"test_suite@notmuchmail.org\", \"Cc\": \"\", \"Bcc\": \"\", \"Date\": \"01 Jan 2000 12:00:00 -0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"multipart/mixed\", \"content\": [{\"id\": 2, \"content-type\": \"text/plain\", \"content\": \"This is a test message with inline attachment with a filename\"}, {\"id\": 3, \"content-type\": \"application/octet-stream\", \"filename\": \"README\"}]}]}, []]]]" ++test_expect_equal "$output" "[[[{\"id\": \"$id\", \"match\": true, \"excluded\": false, \"filename\": \"$filename\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\"], \"headers\": {\"Subject\": \"$subject\", \"From\": \"Notmuch Test Suite \", \"To\": \"test_suite@notmuchmail.org\", \"Cc\": \"\", \"Bcc\": \"\", \"Date\": \"01 Jan 2000 12:00:00 -0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"multipart/mixed\", \"content\": [{\"id\": 2, \"content-type\": \"text/plain\", \"content\": \"This is a test message with inline attachment with a filename\"}, {\"id\": 3, \"content-type\": \"application/octet-stream\", \"filename\": \"README\"}]}]}, []]]]" + + test_begin_subtest "Search message: json, utf-8" + add_message "[subject]=\"json-search-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-search-méssage\"" +diff --git a/test/maildir-sync b/test/maildir-sync +index d5872a5..dfa3966 100755 +--- a/test/maildir-sync ++++ b/test/maildir-sync +@@ -46,6 +46,7 @@ test_begin_subtest "notmuch show works with renamed file (without notmuch new)" + output=$(notmuch show --format=json id:${gen_msg_id} | filter_show_json) + test_expect_equal "$output" '[[[{"id": "adding-replied-tag@notmuch-test-suite", + "match": true, ++"excluded": false, + "filename": "MAIL_DIR/cur/adding-replied-tag:2,RS", + "timestamp": 978709437, + "date_relative": "2001-01-05", +diff --git a/test/multipart b/test/multipart +index 2dd73f5..3d2dcfc 100755 +--- a/test/multipart ++++ b/test/multipart +@@ -108,7 +108,7 @@ notmuch new > /dev/null + test_begin_subtest "--format=text --part=0, full message" + notmuch show --format=text --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT + cat <EXPECTED +- +message{ id:87liy5ap00.fsf@yoom.home.cworth.org depth:0 match:1 filename:${MAIL_DIR}/multipart ++ +message{ id:87liy5ap00.fsf@yoom.home.cworth.org depth:0 match:1 excluded:0 filename:${MAIL_DIR}/multipart + +header{ + Carl Worth (2001-01-05) (attachment inbox signed unread) + Subject: Multipart message +@@ -322,7 +322,7 @@ notmuch show --format=json --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org' | s + echo >>OUTPUT # expect *no* newline at end of output + cat <EXPECTED + +-{"id": "87liy5ap00.fsf@yoom.home.cworth.org", "match": true, "filename": "${MAIL_DIR}/multipart", "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["attachment","inbox","signed","unread"], "headers": {"Subject": "Multipart message", "From": "Carl Worth ", "To": "cworth@cworth.org", "Cc": "", "Bcc": "", "Date": "Fri, 05 Jan 2001 15:43:57 +0000"}, "body": [ ++{"id": "87liy5ap00.fsf@yoom.home.cworth.org", "match": true, "excluded": false, "filename": "${MAIL_DIR}/multipart", "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["attachment","inbox","signed","unread"], "headers": {"Subject": "Multipart message", "From": "Carl Worth ", "To": "cworth@cworth.org", "Cc": "", "Bcc": "", "Date": "Fri, 05 Jan 2001 15:43:57 +0000"}, "body": [ + {"id": 1, "content-type": "multipart/signed", "content": [ + {"id": 2, "content-type": "multipart/mixed", "content": [ + {"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"From": "Carl Worth ", "To": "cworth@cworth.org", "Subject": "html message", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ +diff --git a/test/thread-naming b/test/thread-naming +index 942e593..1a1a48f 100755 +--- a/test/thread-naming ++++ b/test/thread-naming +@@ -65,7 +65,7 @@ test_expect_equal "$output" "thread:XXX 2001-01-12 [6/8] Notmuch Test Suite; t + + test_begin_subtest 'Test order of messages in "notmuch show"' + output=$(notmuch show thread-naming | notmuch_show_sanitize) +-test_expect_equal "$output" " +message{ id:msg-$(printf "%03d" $first)@notmuch-test-suite depth:0 match:1 filename:/XXX/mail/msg-$(printf "%03d" $first) ++test_expect_equal "$output" " +message{ id:msg-$(printf "%03d" $first)@notmuch-test-suite depth:0 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $first) + +header{ + Notmuch Test Suite (2001-01-05) (unread) + Subject: thread-naming: Initial thread subject +@@ -79,7 +79,7 @@ This is just a test message (#$first) + +part} + +body} + +message} +- +message{ id:msg-$(printf "%03d" $((first + 1)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 1))) ++ +message{ id:msg-$(printf "%03d" $((first + 1)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 1))) + +header{ + Notmuch Test Suite (2001-01-06) (inbox unread) + Subject: thread-naming: Older changed subject +@@ -93,7 +93,7 @@ This is just a test message (#$((first + 1))) + +part} + +body} + +message} +- +message{ id:msg-$(printf "%03d" $((first + 2)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 2))) ++ +message{ id:msg-$(printf "%03d" $((first + 2)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 2))) + +header{ + Notmuch Test Suite (2001-01-07) (inbox unread) + Subject: thread-naming: Newer changed subject +@@ -107,7 +107,7 @@ This is just a test message (#$((first + 2))) + +part} + +body} + +message} +- +message{ id:msg-$(printf "%03d" $((first + 3)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 3))) ++ +message{ id:msg-$(printf "%03d" $((first + 3)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 3))) + +header{ + Notmuch Test Suite (2001-01-08) (unread) + Subject: thread-naming: Final thread subject +@@ -121,7 +121,7 @@ This is just a test message (#$((first + 3))) + +part} + +body} + +message} +- +message{ id:msg-$(printf "%03d" $((first + 4)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 4))) ++ +message{ id:msg-$(printf "%03d" $((first + 4)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 4))) + +header{ + Notmuch Test Suite (2001-01-09) (inbox unread) + Subject: Re: thread-naming: Initial thread subject +@@ -135,7 +135,7 @@ This is just a test message (#$((first + 4))) + +part} + +body} + +message} +- +message{ id:msg-$(printf "%03d" $((first + 5)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 5))) ++ +message{ id:msg-$(printf "%03d" $((first + 5)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 5))) + +header{ + Notmuch Test Suite (2001-01-10) (inbox unread) + Subject: Aw: thread-naming: Initial thread subject +@@ -149,7 +149,7 @@ This is just a test message (#$((first + 5))) + +part} + +body} + +message} +- +message{ id:msg-$(printf "%03d" $((first + 6)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 6))) ++ +message{ id:msg-$(printf "%03d" $((first + 6)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 6))) + +header{ + Notmuch Test Suite (2001-01-11) (inbox unread) + Subject: Vs: thread-naming: Initial thread subject +@@ -163,7 +163,7 @@ This is just a test message (#$((first + 6))) + +part} + +body} + +message} +- +message{ id:msg-$(printf "%03d" $((first + 7)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 7))) ++ +message{ id:msg-$(printf "%03d" $((first + 7)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 7))) + +header{ + Notmuch Test Suite (2001-01-12) (inbox unread) + Subject: Sv: thread-naming: Initial thread subject +-- +1.7.2.3 + -- 2.26.2