[PATCH 1/2] Add test for incorrect threading of messages

diff --git a/02/6d86eee55674e91ff696381eba68e4f6c1eb37 b/02/6d86eee55674e91ff696381eba68e4f6c1eb37
new file mode 100644 (file)
index 0000000..eaf3584
--- /dev/null
+++ b/02/6d86eee55674e91ff696381eba68e4f6c1eb37
@@ -0,0 +1,103 @@
+Return-Path: <sojkam1@fel.cvut.cz>\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 19256431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 26 May 2014 07:06:26 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 e6NDeOsjDYPB for <notmuch@notmuchmail.org>;\r
+       Mon, 26 May 2014 07:06:18 -0700 (PDT)\r
+Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6705A431FC0\r
+       for <notmuch@notmuchmail.org>; Mon, 26 May 2014 07:06:13 -0700 (PDT)\r
+Received: from localhost (unknown [192.168.200.7])\r
+       by max.feld.cvut.cz (Postfix) with ESMTP id E302519F362E\r
+       for <notmuch@notmuchmail.org>; Mon, 26 May 2014 16:06:05 +0200 (CEST)\r
+X-Virus-Scanned: IMAP STYX AMAVIS\r
+Received: from max.feld.cvut.cz ([192.168.200.1])\r
+       by localhost (styx.feld.cvut.cz [192.168.200.7]) (amavisd-new,\r
+       port 10044) with ESMTP id HXTsqpTafj8f for <notmuch@notmuchmail.org>;\r
+       Mon, 26 May 2014 16:06:02 +0200 (CEST)\r
+Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34])\r
+       by max.feld.cvut.cz (Postfix) with ESMTP id F091B19F3634\r
+       for <notmuch@notmuchmail.org>; Mon, 26 May 2014 16:06:01 +0200 (CEST)\r
+Received: from wsh by steelpick.2x.cz with local (Exim 4.82)\r
+       (envelope-from <sojkam1@fel.cvut.cz>)\r
+       id 1WovXM-0008S9-10; Mon, 26 May 2014 16:06:00 +0200\r
+From: Michal Sojka <sojkam1@fel.cvut.cz>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] Add test for incorrect threading of messages\r
+Date: Mon, 26 May 2014 16:05:56 +0200\r
+Message-Id: <1401113157-32454-2-git-send-email-sojkam1@fel.cvut.cz>\r
+X-Mailer: git-send-email 2.0.0.rc2\r
+In-Reply-To: <1401113157-32454-1-git-send-email-sojkam1@fel.cvut.cz>\r
+References: <1401113157-32454-1-git-send-email-sojkam1@fel.cvut.cz>\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: Mon, 26 May 2014 14:06:26 -0000\r
+\r
+This happens when there is some garbage after the last Message-ID in\r
+the References header. See for example\r
+https://lkml.org/lkml/headers/2014/5/19/864.\r
+---\r
+ test/T510-thread-replies.sh | 28 ++++++++++++++++++++++++++++\r
+ 1 file changed, 28 insertions(+)\r
+\r
+diff --git a/test/T510-thread-replies.sh b/test/T510-thread-replies.sh\r
+index eeb70d0..d818b89 100755\r
+--- a/test/T510-thread-replies.sh\r
++++ b/test/T510-thread-replies.sh\r
+@@ -137,5 +137,33 @@ expected='[[[{"id": "foo@four.com", "match": true, "excluded": false,\r
+ expected=`echo "$expected" | notmuch_json_show_sanitize`\r
+ test_expect_equal_json "$output" "$expected"\r
+ \r
++test_begin_subtest "Ignore garbage at the end of References"\r
++test_subtest_known_broken\r
++add_message '[id]="foo@five.com"' \\r
++    '[subject]="five"'\r
++add_message '[id]="bar@five.com"' \\r
++    '[references]="<foo@five.com> (garbage)"' \\r
++    '[subject]="not-five"'\r
++output=$(notmuch show --format=json 'subject:five' | notmuch_json_show_sanitize)\r
++expected='[[[{"id": "XXXXX", "match": true, "excluded": false,\r
++ "filename": "YYYYY", "timestamp": 42, "date_relative": "2001-01-05",\r
++ "tags": ["inbox", "unread"], "headers": {"Subject": "five",\r
++ "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
++ "To": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
++ "Date": "GENERATED_DATE"}, "body": [{"id": 1,\r
++ "content-type": "text/plain",\r
++ "content": "This is just a test message (#10)\n"}]},\r
++ [[{"id": "XXXXX", "match": true, "excluded": false,\r
++ "filename": "YYYYY", "timestamp": 42, "date_relative": "2001-01-05",\r
++ "tags": ["inbox", "unread"],\r
++ "headers": {"Subject": "not-five",\r
++ "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
++ "To": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
++ "Date": "GENERATED_DATE"},\r
++ "body": [{"id": 1, "content-type": "text/plain",\r
++ "content": "This is just a test message (#11)\n"}]}, []]]]]]'\r
++expected=`echo "$expected" | notmuch_json_show_sanitize`\r
++test_expect_equal_json "$output" "$expected"\r
++\r
+ \r
+ test_done\r
+-- \r
+2.0.0.rc2\r
+\r