From 69595153bc1cf73e08dc48609e430e9e987ef2bd Mon Sep 17 00:00:00 2001 From: Adam Wolfe Gordon Date: Wed, 22 Feb 2012 23:46:30 +1700 Subject: [PATCH] [PATCH v6 01/10] test: Add broken test for the new JSON reply format. --- af/b73918f84d20e9f4bab21b2c32788c24d18c64 | 124 ++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 af/b73918f84d20e9f4bab21b2c32788c24d18c64 diff --git a/af/b73918f84d20e9f4bab21b2c32788c24d18c64 b/af/b73918f84d20e9f4bab21b2c32788c24d18c64 new file mode 100644 index 000000000..8aca1be3a --- /dev/null +++ b/af/b73918f84d20e9f4bab21b2c32788c24d18c64 @@ -0,0 +1,124 @@ +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 0FE76431FBD + for ; Tue, 21 Feb 2012 22:46:50 -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 Yw8zAu6w1YGR for ; + Tue, 21 Feb 2012 22:46:49 -0800 (PST) +Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10]) + by olra.theworths.org (Postfix) with ESMTP id 110F8431FC7 + for ; Tue, 21 Feb 2012 22:46:46 -0800 (PST) +Received: from pd3ml2so-ssvc.prod.shaw.ca ([10.0.141.138]) + by pd3mo1so-svcs.prod.shaw.ca with ESMTP; 21 Feb 2012 23:46:45 -0700 +X-Cloudmark-SP-Filtered: true +X-Cloudmark-SP-Result: v=1.1 cv=w8ylZ/s5/CpB4NtJ57cq/Y3wf+h+jIFeVVN4WVEh/uc= + c=1 sm=1 + a=K_uluRbb-LAA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17 + a=bz-zy3QpAAAA:8 a=7343-z1_AAAA:8 a=k6VnKhIuyadO14Jm798A:9 + a=FlYb2r3RYQnI0ygSpxoA: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 pd3ml2so-dmz.prod.shaw.ca with ESMTP; 21 Feb 2012 23:46:44 -0700 +Received: by lagos.xvx.ca (Postfix, from userid 1000) + id 794668004ECB; Tue, 21 Feb 2012 23:46:44 -0700 (MST) +From: Adam Wolfe Gordon +To: notmuch@notmuchmail.org +Subject: [PATCH v6 01/10] test: Add broken test for the new JSON reply format. +Date: Tue, 21 Feb 2012 23:46:30 -0700 +Message-Id: <1329893199-21630-2-git-send-email-awg+notmuch@xvx.ca> +X-Mailer: git-send-email 1.7.5.4 +In-Reply-To: <1329893199-21630-1-git-send-email-awg+notmuch@xvx.ca> +References: <1329893199-21630-1-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, 22 Feb 2012 06:46:50 -0000 + +--- + test/multipart | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 52 insertions(+), 0 deletions(-) + +diff --git a/test/multipart b/test/multipart +index a3036b4..f102294 100755 +--- a/test/multipart ++++ b/test/multipart +@@ -589,6 +589,58 @@ Non-text part: text/html + EOF + test_expect_equal_file OUTPUT EXPECTED + ++test_begin_subtest "'notmuch reply' to a multipart message with json format" ++test_subtest_known_broken ++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