[PATCH v5.1 1/4] test: Add broken test for the new JSON reply format.

diff --git a/1c/a1b1189cd595ace137f0726762392b23298c02 b/1c/a1b1189cd595ace137f0726762392b23298c02
new file mode 100644 (file)
index 0000000..fb4efab
--- /dev/null
+++ b/1c/a1b1189cd595ace137f0726762392b23298c02
@@ -0,0 +1,126 @@
+Return-Path: <awg@lagos.xvx.ca>\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 433B8431FBD\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 21:41:46 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_NONE=-0.0001] 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 3XQ5lok9mV1O for <notmuch@notmuchmail.org>;\r
+       Tue, 14 Feb 2012 21:41:45 -0800 (PST)\r
+Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10])\r
+       by olra.theworths.org (Postfix) with ESMTP id A0704431FBC\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 21:41:45 -0800 (PST)\r
+Received: from pd2ml1so-ssvc.prod.shaw.ca ([10.0.141.139])\r
+       by pd3mo1so-svcs.prod.shaw.ca with ESMTP; 14 Feb 2012 22:41:45 -0700\r
+X-Cloudmark-SP-Filtered: true\r
+X-Cloudmark-SP-Result: v=1.1 cv=2TvZ7eE48NdEYeaL5Xf58dNzJU178UzT+2lxUZ5Mhss=\r
+       c=1 sm=1\r
+       a=NvfFcNMagI8A:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17\r
+       a=bz-zy3QpAAAA:8 a=7343-z1_AAAA:8 a=_6ye3Cjbzxy4YbVAO2wA:9\r
+       a=cWgJSRDbQJo15ifq_0oA:7 a=NFWI-YhVVZsA:10 a=0c-eHkXYtrgA:10\r
+       a=pIMJlJgVeHwA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])\r
+       by pd2ml1so-dmz.prod.shaw.ca with ESMTP; 14 Feb 2012 22:41:45 -0700\r
+Received: by lagos.xvx.ca (Postfix, from userid 1000)\r
+       id 78CD58004EBA; Tue, 14 Feb 2012 22:41:44 -0700 (MST)\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5.1 1/4] test: Add broken test for the new JSON reply format.\r
+Date: Tue, 14 Feb 2012 22:41:39 -0700\r
+Message-Id: <1329284499-1594-1-git-send-email-awg+notmuch@xvx.ca>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1329282027-29457-2-git-send-email-awg+notmuch@xvx.ca>\r
+References: <1329282027-29457-2-git-send-email-awg+notmuch@xvx.ca>\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: Wed, 15 Feb 2012 05:41:46 -0000\r
+\r
+---\r
+\r
+Adjusted the header display to be consistent with the other JSON formats.\r
+\r
+ test/multipart |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 1 files changed, 51 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/multipart b/test/multipart\r
+index a3036b4..e7abcc2 100755\r
+--- a/test/multipart\r
++++ b/test/multipart\r
+@@ -589,6 +589,57 @@ Non-text part: text/html\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
++test_begin_subtest "'notmuch reply' to a multipart message with json format"\r
++notmuch reply --format=json 'id:87liy5ap00.fsf@yoom.home.cworth.org' | notmuch_json_show_sanitize >OUTPUT\r
++cat <<EOF >EXPECTED\r
++{"reply-headers": {"Subject": "Re: Multipart message",\r
++ "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
++ "To": "Carl Worth <cworth@cworth.org>,\r
++ cworth@cworth.org",\r
++ "In-reply-to": "<87liy5ap00.fsf@yoom.home.cworth.org>",\r
++ "References": " <87liy5ap00.fsf@yoom.home.cworth.org>"},\r
++ "original": {"id": "XXXXX",\r
++ "match": false,\r
++ "filename": "YYYYY",\r
++ "timestamp": 978709437,\r
++ "date_relative": "2001-01-05",\r
++ "tags": ["attachment","inbox","signed","unread"],\r
++ "headers": {"Subject": "Multipart message",\r
++ "From": "Carl Worth <cworth@cworth.org>",\r
++ "To": "cworth@cworth.org",\r
++ "Date": "Fri,\r
++ 05 Jan 2001 15:43:57 +0000"},\r
++ "body": [{"id": 1,\r
++ "content-type": "multipart/signed",\r
++ "content": [{"id": 2,\r
++ "content-type": "multipart/mixed",\r
++ "content": [{"id": 3,\r
++ "content-type": "message/rfc822",\r
++ "content": [{"headers": {"Subject": "html message",\r
++ "From": "Carl Worth <cworth@cworth.org>",\r
++ "To": "cworth@cworth.org",\r
++ "Date": "Fri,\r
++ 05 Jan 2001 15:42:57 +0000"},\r
++ "body": [{"id": 4,\r
++ "content-type": "multipart/alternative",\r
++ "content": [{"id": 5,\r
++ "content-type": "text/html"},\r
++ {"id": 6,\r
++ "content-type": "text/plain",\r
++ "content": "This is an embedded message,\r
++ with a multipart/alternative part.\n"}]}]}]},\r
++ {"id": 7,\r
++ "content-type": "text/plain",\r
++ "filename": "YYYYY",\r
++ "content": "This is a text attachment.\n"},\r
++ {"id": 8,\r
++ "content-type": "text/plain",\r
++ "content": "And this message is signed.\n\n-Carl\n"}]},\r
++ {"id": 9,\r
++ "content-type": "application/pgp-signature"}]}]}}\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
+ test_begin_subtest "'notmuch show --part' does not corrupt a part with CRLF pair"\r
+ notmuch show --format=raw --part=3 id:base64-part-with-crlf > crlf.out\r
+ echo -n -e "\xEF\x0D\x0A" > crlf.expected\r
+-- \r
+1.7.5.4\r
+\r