From a48a1f05cbf711b72d746b28599784d20df8d158 Mon Sep 17 00:00:00 2001 From: Adam Wolfe Gordon Date: Wed, 14 Mar 2012 22:30:06 +1800 Subject: [PATCH] [PATCH v7.1 01/11] test: Add broken test for the new JSON reply format. --- 56/4407936af382025e96869c26812f8d84ec64aa | 128 ++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 56/4407936af382025e96869c26812f8d84ec64aa diff --git a/56/4407936af382025e96869c26812f8d84ec64aa b/56/4407936af382025e96869c26812f8d84ec64aa new file mode 100644 index 000000000..f79cef389 --- /dev/null +++ b/56/4407936af382025e96869c26812f8d84ec64aa @@ -0,0 +1,128 @@ +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 0E98F431FAE + for ; Tue, 13 Mar 2012 21:30:23 -0700 (PDT) +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=[none] + 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 49R2aiwKzRrQ for ; + Tue, 13 Mar 2012 21:30:22 -0700 (PDT) +Received: from smtp-out-04.shaw.ca (smtp-out-04.shaw.ca [64.59.134.12]) + by olra.theworths.org (Postfix) with ESMTP id 4688A431FAF + for ; Tue, 13 Mar 2012 21:30:22 -0700 (PDT) +Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd7ml1no-ssvc.prod.shaw.ca) + ([10.0.144.222]) + by pd5mo1no-svcs.prod.shaw.ca with ESMTP; 13 Mar 2012 22:30:21 -0600 +X-Cloudmark-SP-Filtered: true +X-Cloudmark-SP-Result: v=1.1 cv=Ro8QOmc0aMDfanRtxUddlQ8SbE2D0zCZP8MBHZpYE5w= + c=1 sm=1 + a=Q0bTnv93de0A:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17 + a=bz-zy3QpAAAA:8 a=7343-z1_AAAA:8 a=k6VnKhIuyadO14Jm798A:9 + a=s2o6Fy0JUDKob3p5bcsA: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 pd7ml1no-dmz.prod.shaw.ca with ESMTP; 13 Mar 2012 22:30:21 -0600 +Received: by lagos.xvx.ca (Postfix, from userid 1000) + id ACA73800422C; Tue, 13 Mar 2012 22:30:20 -0600 (MDT) +From: Adam Wolfe Gordon +To: notmuch@notmuchmail.org +Subject: [PATCH v7.1 01/11] test: Add broken test for the new JSON reply + format. +Date: Tue, 13 Mar 2012 22:30:06 -0600 +Message-Id: <1331699416-30775-2-git-send-email-awg+notmuch@xvx.ca> +X-Mailer: git-send-email 1.7.5.4 +In-Reply-To: <1331699416-30775-1-git-send-email-awg+notmuch@xvx.ca> +References: <1331525142-30539-1-git-send-email-awg+notmuch@xvx.ca> + <1331699416-30775-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, 14 Mar 2012 04:30:23 -0000 + +--- + test/multipart | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 53 insertions(+), 0 deletions(-) + +diff --git a/test/multipart b/test/multipart +index 53782c6..80d6e88 100755 +--- a/test/multipart ++++ b/test/multipart +@@ -589,6 +589,59 @@ 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, ++ "excluded": 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