--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 3BC56431FB6\r
+ for <notmuch@notmuchmail.org>; Thu, 1 Mar 2012 14:29:53 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.202\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.202 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ NORMAL_HTTP_TO_IP=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id Dcpi-HwFxzzP for <notmuch@notmuchmail.org>;\r
+ Thu, 1 Mar 2012 14:29:48 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+ [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 1C149429E33\r
+ for <notmuch@notmuchmail.org>; Thu, 1 Mar 2012 14:29:39 -0800 (PST)\r
+Received: by mail-wi0-f181.google.com with SMTP id o1so305757wic.26\r
+ for <notmuch@notmuchmail.org>; Thu, 01 Mar 2012 14:29:39 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+ 10.216.136.68 as permitted sender) client-ip=10.216.136.68; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+ markwalters1009@gmail.com designates 10.216.136.68 as permitted\r
+ sender) smtp.mail=markwalters1009@gmail.com;\r
+ dkim=pass header.i=markwalters1009@gmail.com\r
+Received: from mr.google.com ([10.216.136.68])\r
+ by 10.216.136.68 with SMTP id v46mr3759394wei.31.1330640979957\r
+ (num_hops = 1); Thu, 01 Mar 2012 14:29:39 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+ :mime-version:content-type:content-transfer-encoding;\r
+ bh=CBJWJIrb9cTW2q8/4UgloLn47lBFqDF622Oetn+iX18=;\r
+ b=eEuZlemH+GYz11gnDJTGnOb25GPcCpe0RLDxRLbgeyFKdjFRtjdpPpbm4RH+9J0m8x\r
+ 67aIVCfPAFcDo9cg0A8BGVLJp1W1sLQJb/yw1zPEFOnlgzTQ09gt381Ul1c+hE6O/5QZ\r
+ eVAe027w6H0nf5XDs8l+B2dGqHfYkMKBAYhJj6MPe7GCOS9bTW7yd/ZK1FvhK4a529j3\r
+ cbsjM7gVbMrR/iibi3GwIlQgnt0WsPNPdnJ+mI+JOSTMlRiS/E3LPAMOP85O2KASljLj\r
+ MXoXLQFLz1Sog2cCHExkEa56dPx0y2mINxlD3ZuEgUqJnnhy03kcBTsj2J6c6EZaQsWy\r
+ RH/w==\r
+Received: by 10.216.136.68 with SMTP id v46mr3029950wei.31.1330640979869;\r
+ Thu, 01 Mar 2012 14:29:39 -0800 (PST)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223]) by mx.google.com with ESMTPS id\r
+ dr5sm16656016wib.0.2012.03.01.14.29.37 (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Thu, 01 Mar 2012 14:29:38 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v7 09/13] test: update tests to reflect the exclude flag\r
+Date: Thu, 1 Mar 2012 22:30:41 +0000\r
+Message-Id: <1330641045-27416-10-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330641045-27416-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330641045-27416-1-git-send-email-markwalters1009@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 01 Mar 2012 22:29:53 -0000\r
+\r
+notmuch show outputs the exclude flag so many tests using notmuch\r
+show failed. This commit adds "excluded:0" or "excluded: false" to\r
+the expected outputs. After this commit there should be no failing\r
+tests.\r
+---\r
+ test/crypto | 9 ++++++++-\r
+ test/encoding | 2 +-\r
+ test/json | 6 +++---\r
+ test/maildir-sync | 1 +\r
+ test/multipart | 6 +++---\r
+ test/thread-naming | 16 ++++++++--------\r
+ 6 files changed, 24 insertions(+), 16 deletions(-)\r
+\r
+diff --git a/test/crypto b/test/crypto\r
+index 7e774c8..4de4d2b 100755\r
+--- a/test/crypto\r
++++ b/test/crypto\r
+@@ -43,6 +43,7 @@ output=$(notmuch show --format=json --verify subject:"test signed message 001" \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+ "match": true,\r
++ "excluded": false,\r
+ "filename": "YYYYY",\r
+ "timestamp": 946728000,\r
+ "date_relative": "2000-01-01",\r
+@@ -76,6 +77,7 @@ output=$(notmuch show --format=json --verify subject:"test signed message 001" \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+ "match": true,\r
++ "excluded": false,\r
+ "filename": "YYYYY",\r
+ "timestamp": 946728000,\r
+ "date_relative": "2000-01-01",\r
+@@ -111,6 +113,7 @@ output=$(notmuch show --format=json --verify subject:"test signed message 001" \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+ "match": true,\r
++ "excluded": false,\r
+ "filename": "YYYYY",\r
+ "timestamp": 946728000,\r
+ "date_relative": "2000-01-01",\r
+@@ -150,7 +153,7 @@ test_begin_subtest "decryption, --format=text"\r
+ output=$(notmuch show --format=text --decrypt subject:"test encrypted message 001" \\r
+ | notmuch_show_sanitize_all \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+-expected='\f\r
+message{ id:XXXXX depth:0 match:1 filename:XXXXX\r
++expected='\f\r
+message{ id:XXXXX depth:0 match:1 excluded:0 filename:XXXXX\r
+ \f\r
+header{\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2000-01-01) (encrypted inbox)\r
+ Subject: test encrypted message 001\r
+@@ -184,6 +187,7 @@ output=$(notmuch show --format=json --decrypt subject:"test encrypted message 00\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+ "match": true,\r
++ "excluded": false,\r
+ "filename": "YYYYY",\r
+ "timestamp": 946728000,\r
+ "date_relative": "2000-01-01",\r
+@@ -238,6 +242,7 @@ output=$(notmuch show --format=json --decrypt subject:"test encrypted message 00\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+ "match": true,\r
++ "excluded": false,\r
+ "filename": "YYYYY",\r
+ "timestamp": 946728000,\r
+ "date_relative": "2000-01-01",\r
+@@ -272,6 +277,7 @@ output=$(notmuch show --format=json --decrypt subject:"test encrypted message 00\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+ "match": true,\r
++ "excluded": false,\r
+ "filename": "YYYYY",\r
+ "timestamp": 946728000,\r
+ "date_relative": "2000-01-01",\r
+@@ -326,6 +332,7 @@ output=$(notmuch show --format=json --verify subject:"test signed message 001" \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+ "match": true,\r
++ "excluded": false,\r
+ "filename": "YYYYY",\r
+ "timestamp": 946728000,\r
+ "date_relative": "2000-01-01",\r
+diff --git a/test/encoding b/test/encoding\r
+index f0d073c..98abf77 100755\r
+--- a/test/encoding\r
++++ b/test/encoding\r
+@@ -6,7 +6,7 @@ test_begin_subtest "Message with text of unknown charset"\r
+ add_message '[content-type]="text/plain; charset=unknown-8bit"' \\r
+ "[body]=irrelevant"\r
+ output=$(notmuch show id:${gen_msg_id} 2>&1 | notmuch_show_sanitize)\r
+-test_expect_equal "$output" "\f\r
+message{ id:msg-001@notmuch-test-suite depth:0 match:1 filename:/XXX/mail/msg-001\r
++test_expect_equal "$output" "\f\r
+message{ id:msg-001@notmuch-test-suite depth:0 match:1 excluded:0 filename:/XXX/mail/msg-001\r
+ \f\r
+header{\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-05) (inbox unread)\r
+ Subject: Test message #1\r
+diff --git a/test/json b/test/json\r
+index 1bdffd2..6439788 100755\r
+--- a/test/json\r
++++ b/test/json\r
+@@ -5,7 +5,7 @@ test_description="--format=json output"\r
+ test_begin_subtest "Show message: json"\r
+ add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-show-message\""\r
+ output=$(notmuch show --format=json "json-show-message")\r
+-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 <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
++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 <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+ \r
+ test_begin_subtest "Search message: json"\r
+ add_message "[subject]=\"json-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-search-message\""\r
+@@ -22,7 +22,7 @@ test_expect_equal "$output" "[{\"thread\": \"XXX\",\r
+ test_begin_subtest "Show message: json, utf-8"\r
+ 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\""\r
+ output=$(notmuch show --format=json "jsön-show-méssage")\r
+-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 <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"jsön-show-méssage\n\"}]}, []]]]"\r
++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 <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"jsön-show-méssage\n\"}]}, []]]]"\r
+ \r
+ test_begin_subtest "Show message: json, inline attachment filename"\r
+ subject='json-show-inline-attachment-filename'\r
+@@ -35,7 +35,7 @@ emacs_deliver_message \\r
+ (insert \"Message-ID: <$id>\n\")"\r
+ output=$(notmuch show --format=json "id:$id")\r
+ filename=$(notmuch search --output=files "id:$id")\r
+-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 <test_suite@notmuchmail.org>\", \"To\": \"test_suite@notmuchmail.org\", \"Date\": \"Sat, 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\"}]}]}, []]]]"\r
++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 <test_suite@notmuchmail.org>\", \"To\": \"test_suite@notmuchmail.org\", \"Date\": \"Sat, 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\"}]}]}, []]]]"\r
+ \r
+ test_begin_subtest "Search message: json, utf-8"\r
+ 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\""\r
+diff --git a/test/maildir-sync b/test/maildir-sync\r
+index 1ee2db0..d72ec07 100755\r
+--- a/test/maildir-sync\r
++++ b/test/maildir-sync\r
+@@ -46,6 +46,7 @@ test_begin_subtest "notmuch show works with renamed file (without notmuch new)"\r
+ output=$(notmuch show --format=json id:${gen_msg_id} | filter_show_json)\r
+ test_expect_equal "$output" '[[[{"id": "adding-replied-tag@notmuch-test-suite",\r
+ "match": true,\r
++"excluded": false,\r
+ "filename": "MAIL_DIR/cur/adding-replied-tag:2,RS",\r
+ "timestamp": 978709437,\r
+ "date_relative": "2001-01-05",\r
+diff --git a/test/multipart b/test/multipart\r
+index a3036b4..53782c6 100755\r
+--- a/test/multipart\r
++++ b/test/multipart\r
+@@ -108,7 +108,7 @@ notmuch new > /dev/null\r
+ test_begin_subtest "--format=text --part=0, full message"\r
+ notmuch show --format=text --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+-\f\r
+message{ id:87liy5ap00.fsf@yoom.home.cworth.org depth:0 match:1 filename:${MAIL_DIR}/multipart\r
++\f\r
+message{ id:87liy5ap00.fsf@yoom.home.cworth.org depth:0 match:1 excluded:0 filename:${MAIL_DIR}/multipart\r
+ \f\r
+header{\r
+ Carl Worth <cworth@cworth.org> (2001-01-05) (attachment inbox signed unread)\r
+ Subject: Multipart message\r
+@@ -322,7 +322,7 @@ notmuch show --format=json --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org' | s\r
+ echo >>OUTPUT # expect *no* newline at end of output\r
+ cat <<EOF >EXPECTED\r
+ \r
+-{"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 <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:43:57 +0000"}, "body": [\r
++{"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 <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:43:57 +0000"}, "body": [\r
+ {"id": 1, "content-type": "multipart/signed", "content": [\r
+ {"id": 2, "content-type": "multipart/mixed", "content": [\r
+ {"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [\r
+@@ -594,4 +594,4 @@ notmuch show --format=raw --part=3 id:base64-part-with-crlf > crlf.out\r
+ echo -n -e "\xEF\x0D\x0A" > crlf.expected\r
+ test_expect_equal_file crlf.out crlf.expected\r
+ \r
+-test_done\r
++test_done\r
+\ No newline at end of file\r
+diff --git a/test/thread-naming b/test/thread-naming\r
+index 942e593..1a1a48f 100755\r
+--- a/test/thread-naming\r
++++ b/test/thread-naming\r
+@@ -65,7 +65,7 @@ test_expect_equal "$output" "thread:XXX 2001-01-12 [6/8] Notmuch Test Suite; t\r
+ \r
+ test_begin_subtest 'Test order of messages in "notmuch show"'\r
+ output=$(notmuch show thread-naming | notmuch_show_sanitize)\r
+-test_expect_equal "$output" "\f\r
+message{ id:msg-$(printf "%03d" $first)@notmuch-test-suite depth:0 match:1 filename:/XXX/mail/msg-$(printf "%03d" $first)\r
++test_expect_equal "$output" "\f\r
+message{ id:msg-$(printf "%03d" $first)@notmuch-test-suite depth:0 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $first)\r
+ \f\r
+header{\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-05) (unread)\r
+ Subject: thread-naming: Initial thread subject\r
+@@ -79,7 +79,7 @@ This is just a test message (#$first)\r
+ \f\r
+part}\r
+ \f\r
+body}\r
+ \f\r
+message}\r
+-\f\r
+message{ id:msg-$(printf "%03d" $((first + 1)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 1)))\r
++\f\r
+message{ id:msg-$(printf "%03d" $((first + 1)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 1)))\r
+ \f\r
+header{\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-06) (inbox unread)\r
+ Subject: thread-naming: Older changed subject\r
+@@ -93,7 +93,7 @@ This is just a test message (#$((first + 1)))\r
+ \f\r
+part}\r
+ \f\r
+body}\r
+ \f\r
+message}\r
+-\f\r
+message{ id:msg-$(printf "%03d" $((first + 2)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 2)))\r
++\f\r
+message{ id:msg-$(printf "%03d" $((first + 2)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 2)))\r
+ \f\r
+header{\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-07) (inbox unread)\r
+ Subject: thread-naming: Newer changed subject\r
+@@ -107,7 +107,7 @@ This is just a test message (#$((first + 2)))\r
+ \f\r
+part}\r
+ \f\r
+body}\r
+ \f\r
+message}\r
+-\f\r
+message{ id:msg-$(printf "%03d" $((first + 3)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 3)))\r
++\f\r
+message{ id:msg-$(printf "%03d" $((first + 3)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 3)))\r
+ \f\r
+header{\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-08) (unread)\r
+ Subject: thread-naming: Final thread subject\r
+@@ -121,7 +121,7 @@ This is just a test message (#$((first + 3)))\r
+ \f\r
+part}\r
+ \f\r
+body}\r
+ \f\r
+message}\r
+-\f\r
+message{ id:msg-$(printf "%03d" $((first + 4)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 4)))\r
++\f\r
+message{ id:msg-$(printf "%03d" $((first + 4)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 4)))\r
+ \f\r
+header{\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-09) (inbox unread)\r
+ Subject: Re: thread-naming: Initial thread subject\r
+@@ -135,7 +135,7 @@ This is just a test message (#$((first + 4)))\r
+ \f\r
+part}\r
+ \f\r
+body}\r
+ \f\r
+message}\r
+-\f\r
+message{ id:msg-$(printf "%03d" $((first + 5)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 5)))\r
++\f\r
+message{ id:msg-$(printf "%03d" $((first + 5)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 5)))\r
+ \f\r
+header{\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-10) (inbox unread)\r
+ Subject: Aw: thread-naming: Initial thread subject\r
+@@ -149,7 +149,7 @@ This is just a test message (#$((first + 5)))\r
+ \f\r
+part}\r
+ \f\r
+body}\r
+ \f\r
+message}\r
+-\f\r
+message{ id:msg-$(printf "%03d" $((first + 6)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 6)))\r
++\f\r
+message{ id:msg-$(printf "%03d" $((first + 6)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 6)))\r
+ \f\r
+header{\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-11) (inbox unread)\r
+ Subject: Vs: thread-naming: Initial thread subject\r
+@@ -163,7 +163,7 @@ This is just a test message (#$((first + 6)))\r
+ \f\r
+part}\r
+ \f\r
+body}\r
+ \f\r
+message}\r
+-\f\r
+message{ id:msg-$(printf "%03d" $((first + 7)))@notmuch-test-suite depth:1 match:1 filename:/XXX/mail/msg-$(printf "%03d" $((first + 7)))\r
++\f\r
+message{ id:msg-$(printf "%03d" $((first + 7)))@notmuch-test-suite depth:1 match:1 excluded:0 filename:/XXX/mail/msg-$(printf "%03d" $((first + 7)))\r
+ \f\r
+header{\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-12) (inbox unread)\r
+ Subject: Sv: thread-naming: Initial thread subject\r
+-- \r
+1.7.2.3\r
+\r