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