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 BB206429E2F
\r
6 for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:24 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.608 tagged_above=-999 required=5
\r
12 tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3, URI_HEX=1.313]
\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 I9LfXHTmp7-v for <notmuch@notmuchmail.org>;
\r
17 Sat, 28 May 2011 14:52:22 -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 0DCFF429E34
\r
21 for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:15 -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 71EAE2E50EF5;
\r
24 Sat, 28 May 2011 14:45:47 -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 996EE2E50E7E;
\r
29 Sat, 28 May 2011 14:45:38 -0700 (PDT)
\r
30 Received: by servo.finestructure.net (Postfix, from userid 1000)
\r
31 id 1FD7F77C; Sat, 28 May 2011 14:52:05 -0700 (PDT)
\r
32 From: Jameson Graef Rollins <jrollins@finestructure.net>
\r
33 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
34 Subject: [PATCH 03/25] test: modify search-output test to use the new
\r
35 test_expect_equal_file function
\r
36 Date: Sat, 28 May 2011 14:51:38 -0700
\r
37 Message-Id: <1306619520-25730-4-git-send-email-jrollins@finestructure.net>
\r
38 X-Mailer: git-send-email 1.7.4.4
\r
39 In-Reply-To: <1306619520-25730-3-git-send-email-jrollins@finestructure.net>
\r
40 References: <1306619520-25730-1-git-send-email-jrollins@finestructure.net>
\r
41 <1306619520-25730-2-git-send-email-jrollins@finestructure.net>
\r
42 <1306619520-25730-3-git-send-email-jrollins@finestructure.net>
\r
43 X-BeenThere: notmuch@notmuchmail.org
\r
44 X-Mailman-Version: 2.1.13
\r
46 List-Id: "Use and development of the notmuch mail system."
\r
47 <notmuch.notmuchmail.org>
\r
48 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
50 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
51 List-Post: <mailto:notmuch@notmuchmail.org>
\r
52 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
53 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
55 X-List-Received-Date: Sat, 28 May 2011 21:52:25 -0000
\r
57 These test now properly test for the presence of a newline at the end
\r
58 of all output. Right now some of these test will fail because the
\r
59 search output is currently broken to *not* produce proper newlines in
\r
62 test/search-output | 72 ++++++++++++++++++++++++++++++++++-----------------
\r
63 1 files changed, 48 insertions(+), 24 deletions(-)
\r
65 diff --git a/test/search-output b/test/search-output
\r
66 index 20341d6..1554eb1 100755
\r
67 --- a/test/search-output
\r
68 +++ b/test/search-output
\r
69 @@ -5,8 +5,8 @@ test_description='various settings for "notmuch search --output="'
\r
72 test_begin_subtest "notmuch search --output=threads"
\r
73 -output=$(notmuch search --output=threads '*' | sed -e s/thread:.*/thread:THREADID/)
\r
74 -test_expect_equal "$output" "thread:THREADID
\r
75 +notmuch search --output=threads '*' | sed -e s/thread:.*/thread:THREADID/ >OUTPUT
\r
76 +cat <<EOF >EXPECTED
\r
80 @@ -27,11 +27,15 @@ thread:THREADID
\r
88 +test_expect_equal_file OUTPUT EXPECTED
\r
90 test_begin_subtest "notmuch search --format=json --output=threads"
\r
91 -output=$(notmuch search --format=json --output=threads '*' | sed -e s/\".*\"/\"THREADID\"/)
\r
92 -test_expect_equal "$output" '["THREADID",
\r
93 +notmuch search --format=json --output=threads '*' | sed -e s/\".*\"/\"THREADID\"/ >OUTPUT
\r
94 +cat <<EOF >EXPECTED
\r
99 @@ -52,11 +56,14 @@ test_expect_equal "$output" '["THREADID",
\r
106 +test_expect_equal_file OUTPUT EXPECTED
\r
108 test_begin_subtest "notmuch search --output=messages"
\r
109 -output=$(notmuch search --output=messages '*')
\r
110 -test_expect_equal "$output" "id:1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk
\r
111 +notmuch search --output=messages '*' >OUTPUT
\r
112 +cat <<EOF >EXPECTED
\r
113 +id:1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk
\r
114 id:877htoqdbo.fsf@yoom.home.cworth.org
\r
115 id:878we4qdqf.fsf@yoom.home.cworth.org
\r
116 id:87aaykqe24.fsf@yoom.home.cworth.org
\r
117 @@ -105,11 +112,14 @@ id:87iqd9rn3l.fsf@vertex.dottedmag
\r
118 id:20091117190054.GU3165@dottiness.seas.harvard.edu
\r
119 id:87lji5cbwo.fsf@yoom.home.cworth.org
\r
120 id:1258471718-6781-2-git-send-email-dottedmag@dottedmag.net
\r
121 -id:1258471718-6781-1-git-send-email-dottedmag@dottedmag.net"
\r
122 +id:1258471718-6781-1-git-send-email-dottedmag@dottedmag.net
\r
124 +test_expect_equal_file OUTPUT EXPECTED
\r
126 test_begin_subtest "notmuch search --format=json --output=messages"
\r
127 -output=$(notmuch search --format=json --output=messages '*')
\r
128 -test_expect_equal "$output" '["1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk",
\r
129 +notmuch search --format=json --output=messages '*' >OUTPUT
\r
130 +cat <<EOF >EXPECTED
\r
131 +["1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk",
\r
132 "877htoqdbo.fsf@yoom.home.cworth.org",
\r
133 "878we4qdqf.fsf@yoom.home.cworth.org",
\r
134 "87aaykqe24.fsf@yoom.home.cworth.org",
\r
135 @@ -158,11 +168,14 @@ test_expect_equal "$output" '["1258544095-16616-1-git-send-email-chris@chris-wil
\r
136 "20091117190054.GU3165@dottiness.seas.harvard.edu",
\r
137 "87lji5cbwo.fsf@yoom.home.cworth.org",
\r
138 "1258471718-6781-2-git-send-email-dottedmag@dottedmag.net",
\r
139 -"1258471718-6781-1-git-send-email-dottedmag@dottedmag.net"]'
\r
140 +"1258471718-6781-1-git-send-email-dottedmag@dottedmag.net"]
\r
142 +test_expect_equal_file OUTPUT EXPECTED
\r
144 test_begin_subtest "notmuch search --output=files"
\r
145 -output=$(notmuch search --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR,")
\r
146 -test_expect_equal "$output" "MAIL_DIR/cur/50:2,
\r
147 +notmuch search --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
\r
148 +cat <<EOF >EXPECTED
\r
149 +MAIL_DIR/cur/50:2,
\r
153 @@ -211,11 +224,14 @@ MAIL_DIR/cur/04:2,
\r
157 -MAIL_DIR/cur/01:2,"
\r
158 +MAIL_DIR/cur/01:2,
\r
160 +test_expect_equal_file OUTPUT EXPECTED
\r
162 test_begin_subtest "notmuch search --format=json --output=files"
\r
163 -output=$(notmuch search --format=json --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR,")
\r
164 -test_expect_equal "$output" '["MAIL_DIR/cur/50:2,",
\r
165 +notmuch search --format=json --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
\r
166 +cat <<EOF >EXPECTED
\r
167 +["MAIL_DIR/cur/50:2,",
\r
168 "MAIL_DIR/cur/49:2,",
\r
169 "MAIL_DIR/cur/48:2,",
\r
170 "MAIL_DIR/cur/47:2,",
\r
171 @@ -264,20 +280,28 @@ test_expect_equal "$output" '["MAIL_DIR/cur/50:2,",
\r
172 "MAIL_DIR/cur/03:2,",
\r
173 "MAIL_DIR/cur/07:2,",
\r
174 "MAIL_DIR/cur/02:2,",
\r
175 -"MAIL_DIR/cur/01:2,"]'
\r
176 +"MAIL_DIR/cur/01:2,"]
\r
178 +test_expect_equal_file OUTPUT EXPECTED
\r
180 test_begin_subtest "notmuch search --output=tags"
\r
181 -output=$(notmuch search --output=tags '*')
\r
182 -test_expect_equal "$output" "attachment
\r
183 +notmuch search --output=tags '*' >OUTPUT
\r
184 +cat <<EOF >EXPECTED
\r
191 +test_expect_equal_file OUTPUT EXPECTED
\r
193 test_begin_subtest "notmuch search --format=json --output=tags"
\r
194 -output=$(notmuch search --format=json --output=tags '*')
\r
195 -test_expect_equal "$output" '["attachment",
\r
196 +notmuch search --format=json --output=tags '*' >OUTPUT
\r
197 +cat <<EOF >EXPECTED
\r
204 +test_expect_equal_file OUTPUT EXPECTED
\r