1 Return-Path: <jrollins@servo.finestructure.net>
\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 C17C5429E38
\r
6 for <notmuch@notmuchmail.org>; Sun, 5 Jun 2011 17:29:47 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5
\r
12 tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]
\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 VymbymC6KNvm for <notmuch@notmuchmail.org>;
\r
17 Sun, 5 Jun 2011 17:29:45 -0700 (PDT)
\r
18 Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu
\r
20 by olra.theworths.org (Postfix) with ESMTP id 82B13429E2E
\r
21 for <notmuch@notmuchmail.org>; Sun, 5 Jun 2011 17:29:40 -0700 (PDT)
\r
22 Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
23 by fire-doxen-postvirus (Postfix) with ESMTP id BED6E3280D8;
\r
24 Sun, 5 Jun 2011 17:22:37 -0700 (PDT)
\r
25 X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new
\r
26 Received: from servo.finestructure.net (cpe-98-149-172-122.socal.res.rr.com
\r
27 [98.149.172.122]) (Authenticated sender: jrollins)
\r
28 by fire-doxen-submit (Postfix) with ESMTP id D72213280E3;
\r
29 Sun, 5 Jun 2011 17:22:29 -0700 (PDT)
\r
30 Received: by servo.finestructure.net (Postfix, from userid 1000)
\r
31 id 1A74E1A7; Sun, 5 Jun 2011 17:29:31 -0700 (PDT)
\r
32 From: Jameson Graef Rollins <jrollins@finestructure.net>
\r
33 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
34 Subject: [PATCH 1/5] test: some small fixes to multipart test
\r
35 Date: Sun, 5 Jun 2011 17:29:25 -0700
\r
36 Message-Id: <1307320169-29905-2-git-send-email-jrollins@finestructure.net>
\r
37 X-Mailer: git-send-email 1.7.4.4
\r
38 In-Reply-To: <1307320169-29905-1-git-send-email-jrollins@finestructure.net>
\r
39 References: <87sjrsi2b4.fsf@servo.factory.finestructure.net>
\r
40 <1307320169-29905-1-git-send-email-jrollins@finestructure.net>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Mon, 06 Jun 2011 00:29:48 -0000
\r
55 There were two "--format=text --part=0" tests. One of them was
\r
56 supposed to be a test for "--format=text --part=1".
\r
58 There were also two errant "test_expect_equal_file OUTPUT EXPECTED"
\r
59 lines, that are removed here.
\r
61 test/multipart | 17 ++---------------
\r
62 1 files changed, 2 insertions(+), 15 deletions(-)
\r
64 diff --git a/test/multipart b/test/multipart
\r
65 index 0879696..9d6a9d1 100755
\r
66 --- a/test/multipart
\r
67 +++ b/test/multipart
\r
68 @@ -129,18 +129,9 @@ Non-text part: application/pgp-signature
\r
70 test_expect_equal_file OUTPUT EXPECTED
\r
72 -test_begin_subtest "--format=text --part=0, full message"
\r
73 -notmuch show --format=text --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
\r
74 +test_begin_subtest "--format=text --part=1, message body"
\r
75 +notmuch show --format=text --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
\r
78 message{ id:87liy5ap00.fsf@yoom.home.cworth.org depth:0 match:1 filename:${MAIL_DIR}/multipart
\r
81 -Carl Worth <cworth@cworth.org> (2001-01-05) (attachment inbox signed unread)
\r
82 -Subject: Multipart message
\r
83 -From: Carl Worth <cworth@cworth.org>
\r
84 -To: cworth@cworth.org
\r
85 -Date: Tue, 05 Jan 2001 15:43:57 -0000
\r
91 part{ ID: 1, Content-type: multipart/signed
\r
93 part{ ID: 2, Content-type: multipart/mixed
\r
95 part{ ID: 3, Content-type: message/rfc822
\r
96 @@ -162,8 +153,6 @@ And this message is signed.
\r
97 Non-text part: application/pgp-signature
\r
107 test_expect_equal_file OUTPUT EXPECTED
\r
109 @@ -257,13 +246,11 @@ test_begin_subtest "--format=json --part=2, multipart/mixed"
\r
110 output=$(notmuch show --format=json --part=2 'id:87liy5ap00.fsf@yoom.home.cworth.org')
\r
111 test_expect_equal "$output" \
\r
112 '{"id": 2, "content-type": "multipart/mixed", "content": [{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}, {"id": 5, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 6, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}'
\r
113 -test_expect_equal_file OUTPUT EXPECTED
\r
115 test_begin_subtest "--format=json --part=3, rfc822 multipart"
\r
116 output=$(notmuch show --format=json --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org')
\r
117 test_expect_equal "$output" \
\r
118 '{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}'
\r
119 -test_expect_equal_file OUTPUT EXPECTED
\r
121 test_begin_subtest "--format=json --part=4, html part"
\r
122 output=$(notmuch show --format=json --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org')
\r