dc/22fa4beb6b40204eb526c8cba4a9627377a0e4

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 78D90429E42\r
   6         for <notmuch@notmuchmail.org>; Fri, 17 Feb 2012 10:22:46 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id b6pvXBAnTyzM for <notmuch@notmuchmail.org>;\r
  16         Fri, 17 Feb 2012 10:22:44 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
  18         [18.9.25.12])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 59CFA431FB6\r
  20         for <notmuch@notmuchmail.org>; Fri, 17 Feb 2012 10:22:44 -0800 (PST)\r
  21 X-AuditID: 1209190c-b7fad6d000000920-35-4f3e9af303a3\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 9C.07.02336.3FA9E3F4; Fri, 17 Feb 2012 13:22:43 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1HIMgK7007037; \r
  27         Fri, 17 Feb 2012 13:22:43 -0500\r
  28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1HIMfHc004402\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Fri, 17 Feb 2012 13:22:42 -0500 (EST)\r
  34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1RySQT-0003d5-Bb; Fri, 17 Feb 2012 13:20:57 -0500\r
  37 Date: Fri, 17 Feb 2012 13:20:57 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
  40 Subject: Re: [PATCH v5.2 1/7] test: Add broken test for the new JSON reply\r
  41         format.\r
  42 Message-ID: <20120217182057.GF5991@mit.edu>\r
  43 References: <1329361957-28493-1-git-send-email-awg+notmuch@xvx.ca>\r
  44         <1329361957-28493-2-git-send-email-awg+notmuch@xvx.ca>\r
  45 MIME-Version: 1.0\r
  46 Content-Type: text/plain; charset=us-ascii\r
  47 Content-Disposition: inline\r
  48 In-Reply-To: <1329361957-28493-2-git-send-email-awg+notmuch@xvx.ca>\r
  49 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  50 X-Brightmail-Tracker:\r
  51  H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hRV1v08y87foLnfxOLInlnsFtdvzmR2\r
  52         YPJ4tuoWs0fTj8WsAUxRXDYpqTmZZalF+nYJXBkLLi9kL2gQq9i416yBcb1QFyMnh4SAicTD\r
  53         rvnsELaYxIV769m6GLk4hAT2MUpMW3uSHcLZwCix/M4ORgjnJJPEh9fXmSGcJYwSV/evZQPp\r
  54         ZxFQlVj7pB9sFpuAhsS2/csZQWwRAS2JH+u/soLYzALSEt9+NzOB2MICIRK7Jm1hAbF5BbQl\r
  55         erdNAesVEqiW6H/3jQ0iLihxcuYTFoheLYkb/14C9XKAzVn+jwMkzCngLDH3yyKwclEBFYkp\r
  56         J7exTWAUmoWkexaS7lkI3QsYmVcxyqbkVunmJmbmFKcm6xYnJ+blpRbpGurlZpbopaaUbmIE\r
  57         h7Ukzw7GNweVDjEKcDAq8fC+6rTzF2JNLCuuzD3EKMnBpCTKWz4dKMSXlJ9SmZFYnBFfVJqT\r
  58         WnyIUYKDWUmE91suUI43JbGyKrUoHyYlzcGiJM6rovXOT0ggPbEkNTs1tSC1CCYrw8GhJMEr\r
  59         BIxfIcGi1PTUirTMnBKENBMHJ8hwHqDhIiA1vMUFibnFmekQ+VOMilLivAYgCQGQREZpHlwv\r
  60         LO28YhQHekWYlwWkigeYsuC6XwENZgIazCsENrgkESEl1cDItGfp1qcvGV6cCHQ+ZK5/niPd\r
  61         OuCDdu8pQ/Hs//5bqxKjc9MXbYi8GHouoUylc0N2Y/6c0u/XZA682bclfd7idkezIp/lJpG/\r
  62         dN4/bSxZoXNGhylHXlHCncdc6G9ibYDsxSD+c2G7pXaf5JviNHuHx5eS8ujZNZo2ttYHuROf\r
  63         ipbLuXUnXVZiKc5INNRiLipOBABweWRjFgMAAA==\r
  64 Cc: notmuch@notmuchmail.org\r
  65 X-BeenThere: notmuch@notmuchmail.org\r
  66 X-Mailman-Version: 2.1.13\r
  67 Precedence: list\r
  68 List-Id: "Use and development of the notmuch mail system."\r
  69         <notmuch.notmuchmail.org>\r
  70 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  72 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  73 List-Post: <mailto:notmuch@notmuchmail.org>\r
  74 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  75 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  76         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  77 X-List-Received-Date: Fri, 17 Feb 2012 18:22:46 -0000\r
  78 \r
  79 One nit, actually.  It would good if this test were marked\r
  80 test_subtest_known_broken by this patch and then unmarked broken by\r
  81 the patch that adds the JSON reply format so that the test doesn't\r
  82 outright fail at any point in the history.\r
  83 \r
  84 Quoth Adam Wolfe Gordon on Feb 15 at  8:12 pm:\r
  85 > ---\r
  86 >  test/multipart |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++\r
  87 >  1 files changed, 51 insertions(+), 0 deletions(-)\r
  88 > \r
  89 > diff --git a/test/multipart b/test/multipart\r
  90 > index a3036b4..e7abcc2 100755\r
  91 > --- a/test/multipart\r
  92 > +++ b/test/multipart\r
  93 > @@ -589,6 +589,57 @@ Non-text part: text/html\r
  94 >  EOF\r
  95 >  test_expect_equal_file OUTPUT EXPECTED\r
  96 >  \r
  97 > +test_begin_subtest "'notmuch reply' to a multipart message with json format"\r
  98 > +notmuch reply --format=json 'id:87liy5ap00.fsf@yoom.home.cworth.org' | notmuch_json_show_sanitize >OUTPUT\r
  99 > +cat <<EOF >EXPECTED\r
 100 > +{"reply-headers": {"Subject": "Re: Multipart message",\r
 101 > + "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
 102 > + "To": "Carl Worth <cworth@cworth.org>,\r
 103 > + cworth@cworth.org",\r
 104 > + "In-reply-to": "<87liy5ap00.fsf@yoom.home.cworth.org>",\r
 105 > + "References": " <87liy5ap00.fsf@yoom.home.cworth.org>"},\r
 106 > + "original": {"id": "XXXXX",\r
 107 > + "match": false,\r
 108 > + "filename": "YYYYY",\r
 109 > + "timestamp": 978709437,\r
 110 > + "date_relative": "2001-01-05",\r
 111 > + "tags": ["attachment","inbox","signed","unread"],\r
 112 > + "headers": {"Subject": "Multipart message",\r
 113 > + "From": "Carl Worth <cworth@cworth.org>",\r
 114 > + "To": "cworth@cworth.org",\r
 115 > + "Date": "Fri,\r
 116 > + 05 Jan 2001 15:43:57 +0000"},\r
 117 > + "body": [{"id": 1,\r
 118 > + "content-type": "multipart/signed",\r
 119 > + "content": [{"id": 2,\r
 120 > + "content-type": "multipart/mixed",\r
 121 > + "content": [{"id": 3,\r
 122 > + "content-type": "message/rfc822",\r
 123 > + "content": [{"headers": {"Subject": "html message",\r
 124 > + "From": "Carl Worth <cworth@cworth.org>",\r
 125 > + "To": "cworth@cworth.org",\r
 126 > + "Date": "Fri,\r
 127 > + 05 Jan 2001 15:42:57 +0000"},\r
 128 > + "body": [{"id": 4,\r
 129 > + "content-type": "multipart/alternative",\r
 130 > + "content": [{"id": 5,\r
 131 > + "content-type": "text/html"},\r
 132 > + {"id": 6,\r
 133 > + "content-type": "text/plain",\r
 134 > + "content": "This is an embedded message,\r
 135 > + with a multipart/alternative part.\n"}]}]}]},\r
 136 > + {"id": 7,\r
 137 > + "content-type": "text/plain",\r
 138 > + "filename": "YYYYY",\r
 139 > + "content": "This is a text attachment.\n"},\r
 140 > + {"id": 8,\r
 141 > + "content-type": "text/plain",\r
 142 > + "content": "And this message is signed.\n\n-Carl\n"}]},\r
 143 > + {"id": 9,\r
 144 > + "content-type": "application/pgp-signature"}]}]}}\r
 145 > +EOF\r
 146 > +test_expect_equal_file OUTPUT EXPECTED\r
 147 > +\r
 148 >  test_begin_subtest "'notmuch show --part' does not corrupt a part with CRLF pair"\r
 149 >  notmuch show --format=raw --part=3 id:base64-part-with-crlf > crlf.out\r
 150 >  echo -n -e "\xEF\x0D\x0A" > crlf.expected\r