1 Return-Path: <novalazy@gmail.com>
\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 65931431FBF
\r
6 for <notmuch@notmuchmail.org>; Sun, 5 Aug 2012 00:23:00 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id yhD81x02EihV for <notmuch@notmuchmail.org>;
\r
17 Sun, 5 Aug 2012 00:22:59 -0700 (PDT)
\r
18 Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com
\r
19 [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id BD866431FB6
\r
22 for <notmuch@notmuchmail.org>; Sun, 5 Aug 2012 00:22:58 -0700 (PDT)
\r
23 Received: by mail-pb0-f53.google.com with SMTP id ro8so3935886pbb.26
\r
24 for <notmuch@notmuchmail.org>; Sun, 05 Aug 2012 00:22:58 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=ih2RhhTfEv8hjCF/o9vvOovW3JIovK+jhtURw0LHng8=;
\r
28 b=pbemADZz3LVjJMSl4eo3E4R4s/CAygwYumv5vXQD60Dp7CeNQLk9UaqppSsmeanpPd
\r
29 8MFvR32oNQcfpMEMEy8XgKUvwUYCBpzflKMSZKgwPK2GHRYIo4Ow8OeXdvHFB7nu3VSt
\r
30 c/Pqlu+SQ47i5q2RvBhqPDXQF/N5J3+1yEE1DIGsNCWx5vA5omE9bZ4nYULej/CrjAs9
\r
31 XQhbLPPX0hls35ke4Xa1VT8OMnjzD73HnrW++Bum0ulKc5GSXc39B9CZl5TrRKWs7flv
\r
32 y78k0NiJ6UVQQonaOwCpp8YAnzocmEEolBUl9WlafwLE9OLNSX/pXHCSAWNNnXEZI++B
\r
34 Received: by 10.68.229.2 with SMTP id sm2mr9807808pbc.57.1344151378571;
\r
35 Sun, 05 Aug 2012 00:22:58 -0700 (PDT)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id qi8sm6409079pbc.36.2012.08.05.00.22.56
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sun, 05 Aug 2012 00:22:57 -0700 (PDT)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH 4/4] test: conform to content-length fields (text)
\r
44 Date: Sun, 5 Aug 2012 17:22:25 +1000
\r
45 Message-Id: <1344151345-25411-4-git-send-email-novalazy@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.4.4
\r
47 In-Reply-To: <1344151345-25411-1-git-send-email-novalazy@gmail.com>
\r
48 References: <1344151345-25411-1-git-send-email-novalazy@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sun, 05 Aug 2012 07:23:00 -0000
\r
63 Update tests to expect Content-length fields in show --format=text
\r
64 output, for leaf parts with omitted body content.
\r
66 test/crypto | 4 ++--
\r
67 test/multipart | 18 +++++++++---------
\r
68 2 files changed, 11 insertions(+), 11 deletions(-)
\r
70 diff --git a/test/crypto b/test/crypto
\r
71 index 4a73dcc..8dfbfa6 100755
\r
74 @@ -161,14 +161,14 @@ Date: Sat, 01 Jan 2000 12:00:00 +0000
\r
80 part{ ID: 1, Content-type: multipart/encrypted
\r
82 part{ ID: 2, Content-type: application/pgp-encrypted
\r
84 part{ ID: 2, Content-type: application/pgp-encrypted, Content-length: 11
\r
85 Non-text part: application/pgp-encrypted
\r
89 part{ ID: 3, Content-type: multipart/mixed
\r
91 part{ ID: 4, Content-type: text/plain
\r
92 This is a test encrypted message.
\r
96 attachment{ ID: 5, Filename: TESTATTACHMENT, Content-type: application/octet-stream
\r
98 attachment{ ID: 5, Filename: TESTATTACHMENT, Content-type: application/octet-stream, Content-length: 28
\r
99 Non-text part: application/octet-stream
\r
104 diff --git a/test/multipart b/test/multipart
\r
105 index 0f9e113..064e91a 100755
\r
106 --- a/test/multipart
\r
107 +++ b/test/multipart
\r
108 @@ -129,7 +129,7 @@ Date: Fri, 05 Jan 2001 15:42:57 +0000
\r
114 part{ ID: 4, Content-type: multipart/alternative
\r
116 part{ ID: 5, Content-type: text/html
\r
118 part{ ID: 5, Content-type: text/html, Content-length: 71
\r
119 Non-text part: text/html
\r
123 part{ ID: 6, Content-type: text/plain
\r
124 @@ -147,7 +147,7 @@ And this message is signed.
\r
131 part{ ID: 9, Content-type: application/pgp-signature
\r
133 part{ ID: 9, Content-type: application/pgp-signature, Content-length: 197
\r
134 Non-text part: application/pgp-signature
\r
139 @@ -170,7 +170,7 @@ Date: Fri, 05 Jan 2001 15:42:57 +0000
\r
145 part{ ID: 4, Content-type: multipart/alternative
\r
147 part{ ID: 5, Content-type: text/html
\r
149 part{ ID: 5, Content-type: text/html, Content-length: 71
\r
150 Non-text part: text/html
\r
154 part{ ID: 6, Content-type: text/plain
\r
155 @@ -188,7 +188,7 @@ And this message is signed.
\r
162 part{ ID: 9, Content-type: application/pgp-signature
\r
164 part{ ID: 9, Content-type: application/pgp-signature, Content-length: 197
\r
165 Non-text part: application/pgp-signature
\r
170 @@ -208,7 +208,7 @@ Date: Fri, 05 Jan 2001 15:42:57 +0000
\r
176 part{ ID: 4, Content-type: multipart/alternative
\r
178 part{ ID: 5, Content-type: text/html
\r
180 part{ ID: 5, Content-type: text/html, Content-length: 71
\r
181 Non-text part: text/html
\r
185 part{ ID: 6, Content-type: text/plain
\r
186 @@ -241,7 +241,7 @@ Date: Fri, 05 Jan 2001 15:42:57 +0000
\r
192 part{ ID: 4, Content-type: multipart/alternative
\r
194 part{ ID: 5, Content-type: text/html
\r
196 part{ ID: 5, Content-type: text/html, Content-length: 71
\r
197 Non-text part: text/html
\r
201 part{ ID: 6, Content-type: text/plain
\r
202 @@ -257,7 +257,7 @@ test_begin_subtest "--format=text --part=4, rfc822's multipart"
\r
203 notmuch show --format=text --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
\r
204 cat <<EOF >EXPECTED
\r
206 part{ ID: 4, Content-type: multipart/alternative
\r
208 part{ ID: 5, Content-type: text/html
\r
210 part{ ID: 5, Content-type: text/html, Content-length: 71
\r
211 Non-text part: text/html
\r
215 part{ ID: 6, Content-type: text/plain
\r
216 @@ -270,7 +270,7 @@ test_expect_equal_file OUTPUT EXPECTED
\r
217 test_begin_subtest "--format=text --part=5, rfc822's html part"
\r
218 notmuch show --format=text --part=5 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
\r
219 cat <<EOF >EXPECTED
\r
221 part{ ID: 5, Content-type: text/html
\r
223 part{ ID: 5, Content-type: text/html, Content-length: 71
\r
224 Non-text part: text/html
\r
228 @@ -308,7 +308,7 @@ test_expect_equal_file OUTPUT EXPECTED
\r
229 test_begin_subtest "--format=text --part=9, pgp signature (unverified)"
\r
230 notmuch show --format=text --part=9 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
\r
231 cat <<EOF >EXPECTED
\r
233 part{ ID: 9, Content-type: application/pgp-signature
\r
235 part{ ID: 9, Content-type: application/pgp-signature, Content-length: 197
\r
236 Non-text part: application/pgp-signature
\r