1 Return-Path: <too@guru.guru-group.fi>
\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 B73EA429E21
\r
6 for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 08:54:03 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 vXczsTHbNdmw for <notmuch@notmuchmail.org>;
\r
16 Wed, 11 Jan 2012 08:54:01 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 563DF431FB6
\r
19 for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 08:54:00 -0800 (PST)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id 988DF68055; Wed, 11 Jan 2012 18:54:00 +0200 (EET)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: <notmuch@notmuchmail.org>
\r
24 Subject: [PATCH] test: whitespace-cleanup for most test/* files
\r
25 Date: Wed, 11 Jan 2012 18:53:59 +0200
\r
26 Message-Id: <1326300839-12085-1-git-send-email-tomi.ollila@iki.fi>
\r
27 X-Mailer: git-send-email 1.7.6.1
\r
28 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\r
29 X-BeenThere: notmuch@notmuchmail.org
\r
30 X-Mailman-Version: 2.1.13
\r
32 List-Id: "Use and development of the notmuch mail system."
\r
33 <notmuch.notmuchmail.org>
\r
34 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
35 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
36 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
37 List-Post: <mailto:notmuch@notmuchmail.org>
\r
38 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
39 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
40 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
41 X-List-Received-Date: Wed, 11 Jan 2012 16:54:03 -0000
\r
43 Used emacs (whitespace-cleanup) function to "cleanup blank problems"
\r
44 in test files where that could be done without breaking tests;
\r
45 test/emacs was partially, and test/multipart was fully reverted.
\r
47 test/emacs | 50 ++++++++--------
\r
48 test/encoding | 2 +-
\r
49 test/from-guessing | 126 +++++++++++++++++++-------------------
\r
50 test/reply | 58 +++++++++---------
\r
51 test/search-position-overlap-bug | 4 +-
\r
52 test/symbol-hiding | 2 +-
\r
53 test/test-lib.sh | 10 ++--
\r
54 test/thread-naming | 30 +++++-----
\r
55 8 files changed, 141 insertions(+), 141 deletions(-)
\r
57 diff --git a/test/emacs b/test/emacs
\r
58 index a06c223..8160c59 100755
\r
61 @@ -225,7 +225,7 @@ test_expect_equal_file OUTPUT EXPECTED
\r
62 mkdir -p mail/sent-list-catch-all/cur
\r
63 mkdir -p mail/sent-list-catch-all/new
\r
64 mkdir -p mail/sent-list-catch-all/tmp
\r
67 test_begin_subtest "notmuch-fcc-dirs set to a list (catch-all)"
\r
68 test_emacs "(let ((notmuch-fcc-dirs
\r
69 '((\"example.com\" . \"failure\")
\r
70 @@ -373,22 +373,22 @@ add_message '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' \
\r
71 '[body]="Unable to stash body. Where did you get it in the first place?!?"'
\r
72 notmuch tag +stashtest id:${gen_msg_id}
\r
73 test_emacs '(notmuch-show "id:\"bought\"")
\r
74 - (notmuch-show-stash-date)
\r
75 - (notmuch-show-stash-from)
\r
76 - (notmuch-show-stash-to)
\r
77 - (notmuch-show-stash-cc)
\r
78 - (notmuch-show-stash-subject)
\r
79 - (notmuch-show-stash-message-id)
\r
80 - (notmuch-show-stash-message-id-stripped)
\r
81 - (notmuch-show-stash-tags)
\r
82 - (notmuch-show-stash-filename)
\r
84 - (generate-new-buffer "*test-stashing*"))
\r
88 - (rotate-yank-pointer 1))
\r
89 - (reverse-region (point-min) (point-max))
\r
90 + (notmuch-show-stash-date)
\r
91 + (notmuch-show-stash-from)
\r
92 + (notmuch-show-stash-to)
\r
93 + (notmuch-show-stash-cc)
\r
94 + (notmuch-show-stash-subject)
\r
95 + (notmuch-show-stash-message-id)
\r
96 + (notmuch-show-stash-message-id-stripped)
\r
97 + (notmuch-show-stash-tags)
\r
98 + (notmuch-show-stash-filename)
\r
100 + (generate-new-buffer "*test-stashing*"))
\r
104 + (rotate-yank-pointer 1))
\r
105 + (reverse-region (point-min) (point-max))
\r
107 cat <<EOF >EXPECTED
\r
108 Sat, 01 Jan 2000 12:00:00 -0000
\r
109 @@ -405,11 +405,11 @@ test_expect_equal_file OUTPUT EXPECTED
\r
111 test_begin_subtest "Stashing in notmuch-search"
\r
112 test_emacs '(notmuch-search "id:\"bought\"")
\r
113 - (notmuch-test-wait)
\r
114 - (notmuch-search-stash-thread-id)
\r
115 - (switch-to-buffer
\r
116 - (generate-new-buffer "*test-stashing*"))
\r
118 + (notmuch-test-wait)
\r
119 + (notmuch-search-stash-thread-id)
\r
120 + (switch-to-buffer
\r
121 + (generate-new-buffer "*test-stashing*"))
\r
124 sed -i -e 's/^thread:.*$/thread:XXX/' OUTPUT
\r
125 test_expect_equal "$(cat OUTPUT)" "thread:XXX"
\r
126 @@ -438,9 +438,9 @@ test_expect_equal_file OUTPUT EXPECTED
\r
127 test_begin_subtest "Refresh modified show buffer"
\r
128 test_subtest_known_broken
\r
129 test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com")
\r
130 - (notmuch-show-toggle-message)
\r
131 - (notmuch-show-next-message)
\r
132 - (notmuch-show-toggle-message)
\r
133 + (notmuch-show-toggle-message)
\r
134 + (notmuch-show-next-message)
\r
135 + (notmuch-show-toggle-message)
\r
136 (test-visible-output "EXPECTED")
\r
137 (notmuch-show-refresh-view)
\r
138 (test-visible-output)'
\r
139 diff --git a/test/encoding b/test/encoding
\r
140 index e875c8b..33259c1 100755
\r
141 --- a/test/encoding
\r
142 +++ b/test/encoding
\r
143 @@ -4,7 +4,7 @@ test_description="encoding issues"
\r
145 test_begin_subtest "Message with text of unknown charset"
\r
146 add_message '[content-type]="text/plain; charset=unknown-8bit"' \
\r
147 - "[body]=irrelevant"
\r
148 + "[body]=irrelevant"
\r
149 output=$(notmuch show id:${gen_msg_id} 2>&1 | notmuch_show_sanitize)
\r
150 test_expect_equal "$output" "
\f\r
151 message{ id:msg-001@notmuch-test-suite depth:0 match:1 filename:/XXX/mail/msg-001
\r
154 diff --git a/test/from-guessing b/test/from-guessing
\r
155 index 8b69cf6..6dfaa40 100755
\r
156 --- a/test/from-guessing
\r
157 +++ b/test/from-guessing
\r
158 @@ -4,10 +4,10 @@ test_description="From line heuristics (with multiple configured addresses)"
\r
160 test_begin_subtest "Magic from guessing (nothing to go on)"
\r
161 add_message '[from]="Sender <sender@example.com>"' \
\r
162 - [to]=mailinglist@notmuchmail.org \
\r
163 - [subject]=notmuch-reply-test \
\r
164 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
165 - '[body]="from guessing test"'
\r
166 + [to]=mailinglist@notmuchmail.org \
\r
167 + [subject]=notmuch-reply-test \
\r
168 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
169 + '[body]="from guessing test"'
\r
171 output=$(notmuch reply id:${gen_msg_id})
\r
172 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
173 @@ -21,11 +21,11 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
175 test_begin_subtest "Magic from guessing (Envelope-to:)"
\r
176 add_message '[from]="Sender <sender@example.com>"' \
\r
177 - [to]=mailinglist@notmuchmail.org \
\r
178 - [subject]=notmuch-reply-test \
\r
179 - '[header]="Envelope-To: test_suite_other@notmuchmail.org"' \
\r
180 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
181 - '[body]="from guessing test"'
\r
182 + [to]=mailinglist@notmuchmail.org \
\r
183 + [subject]=notmuch-reply-test \
\r
184 + '[header]="Envelope-To: test_suite_other@notmuchmail.org"' \
\r
185 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
186 + '[body]="from guessing test"'
\r
188 output=$(notmuch reply id:${gen_msg_id})
\r
189 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
\r
190 @@ -39,11 +39,11 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
192 test_begin_subtest "Magic from guessing (X-Original-To:)"
\r
193 add_message '[from]="Sender <sender@example.com>"' \
\r
194 - [to]=mailinglist@notmuchmail.org \
\r
195 - [subject]=notmuch-reply-test \
\r
196 - '[header]="X-Original-To: test_suite_other@notmuchmail.org"' \
\r
197 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
198 - '[body]="from guessing test"'
\r
199 + [to]=mailinglist@notmuchmail.org \
\r
200 + [subject]=notmuch-reply-test \
\r
201 + '[header]="X-Original-To: test_suite_other@notmuchmail.org"' \
\r
202 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
203 + '[body]="from guessing test"'
\r
205 output=$(notmuch reply id:${gen_msg_id})
\r
206 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
\r
207 @@ -57,13 +57,13 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
209 test_begin_subtest "Magic from guessing (Received: .. for ..)"
\r
210 add_message '[from]="Sender <sender@example.com>"' \
\r
211 - [to]=mailinglist@notmuchmail.org \
\r
212 - [subject]=notmuch-reply-test \
\r
213 - "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
\r
214 - by mail.notmuchmail.org (some MTA) with ESMTP id 12345678
\r
215 - for <test_suite_other@notmuchmail.org>; Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
\r
216 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
217 - '[body]="from guessing test"'
\r
218 + [to]=mailinglist@notmuchmail.org \
\r
219 + [subject]=notmuch-reply-test \
\r
220 + "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
\r
221 + by mail.notmuchmail.org (some MTA) with ESMTP id 12345678
\r
222 + for <test_suite_other@notmuchmail.org>; Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
\r
223 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
224 + '[body]="from guessing test"'
\r
226 output=$(notmuch reply id:${gen_msg_id})
\r
227 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
\r
228 @@ -77,13 +77,13 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
230 test_begin_subtest "Magic from guessing (Received: domain)"
\r
231 add_message '[from]="Sender <sender@example.com>"' \
\r
232 - [to]=mailinglist@notmuchmail.org \
\r
233 - [subject]=notmuch-reply-test \
\r
234 - "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
\r
235 - by mail.otherdomain.org (some MTA) with ESMTP id 12345678
\r
236 - Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
\r
237 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
238 - '[body]="from guessing test"'
\r
239 + [to]=mailinglist@notmuchmail.org \
\r
240 + [subject]=notmuch-reply-test \
\r
241 + "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
\r
242 + by mail.otherdomain.org (some MTA) with ESMTP id 12345678
\r
243 + Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
\r
244 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
245 + '[body]="from guessing test"'
\r
247 output=$(notmuch reply id:${gen_msg_id})
\r
248 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@otherdomain.org>
\r
249 @@ -97,15 +97,15 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
251 test_begin_subtest "Magic from guessing (multiple Received: headers)"
\r
252 add_message '[from]="Sender <sender@example.com>"' \
\r
253 - [to]=mailinglist@notmuchmail.org \
\r
254 - [subject]=notmuch-reply-test \
\r
255 - "[header]=\"Received: from extraneous.example.com (extraneous.example.com [1.1.1.1])
\r
256 + [to]=mailinglist@notmuchmail.org \
\r
257 + [subject]=notmuch-reply-test \
\r
258 + "[header]=\"Received: from extraneous.example.com (extraneous.example.com [1.1.1.1])
\r
259 Received: from mail.example.com (mail.example.com [1.1.1.1])
\r
260 - by mail.otherdomain.org (some MTA) with ESMTP id 12345678
\r
261 - for <test_suite_other@notmuchmail.org>; Sat, 10 Apr 2010 07:54:51 -0400 (EDT)
\r
262 + by mail.otherdomain.org (some MTA) with ESMTP id 12345678
\r
263 + for <test_suite_other@notmuchmail.org>; Sat, 10 Apr 2010 07:54:51 -0400 (EDT)
\r
264 Received: from extraneous.example.com (extraneous.example.com [1.1.1.1])\"" \
\r
265 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
266 - '[body]="from guessing test"'
\r
267 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
268 + '[body]="from guessing test"'
\r
270 output="$(notmuch reply id:${gen_msg_id})"
\r
271 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
\r
272 @@ -123,10 +123,10 @@ test_expect_equal '' ''
\r
274 test_begin_subtest "Magic from guessing (nothing to go on)"
\r
275 add_message '[from]="Sender <sender@example.com>"' \
\r
276 - [to]=mailinglist@notmuchmail.org \
\r
277 - [subject]=notmuch-reply-test \
\r
278 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
279 - '[body]="from guessing test"'
\r
280 + [to]=mailinglist@notmuchmail.org \
\r
281 + [subject]=notmuch-reply-test \
\r
282 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
283 + '[body]="from guessing test"'
\r
285 output=$(notmuch reply id:${gen_msg_id})
\r
286 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
287 @@ -140,11 +140,11 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
289 test_begin_subtest "Magic from guessing (Envelope-to:)"
\r
290 add_message '[from]="Sender <sender@example.com>"' \
\r
291 - [to]=mailinglist@notmuchmail.org \
\r
292 - [subject]=notmuch-reply-test \
\r
293 - '[header]="Envelope-To: test_suite_other@notmuchmail.org"' \
\r
294 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
295 - '[body]="from guessing test"'
\r
296 + [to]=mailinglist@notmuchmail.org \
\r
297 + [subject]=notmuch-reply-test \
\r
298 + '[header]="Envelope-To: test_suite_other@notmuchmail.org"' \
\r
299 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
300 + '[body]="from guessing test"'
\r
302 output=$(notmuch reply id:${gen_msg_id})
\r
303 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
304 @@ -158,11 +158,11 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
306 test_begin_subtest "Magic from guessing (X-Original-To:)"
\r
307 add_message '[from]="Sender <sender@example.com>"' \
\r
308 - [to]=mailinglist@notmuchmail.org \
\r
309 - [subject]=notmuch-reply-test \
\r
310 - '[header]="X-Original-To: test_suite_other@notmuchmail.org"' \
\r
311 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
312 - '[body]="from guessing test"'
\r
313 + [to]=mailinglist@notmuchmail.org \
\r
314 + [subject]=notmuch-reply-test \
\r
315 + '[header]="X-Original-To: test_suite_other@notmuchmail.org"' \
\r
316 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
317 + '[body]="from guessing test"'
\r
319 output=$(notmuch reply id:${gen_msg_id})
\r
320 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
321 @@ -176,13 +176,13 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
323 test_begin_subtest "Magic from guessing (Received: .. for ..)"
\r
324 add_message '[from]="Sender <sender@example.com>"' \
\r
325 - [to]=mailinglist@notmuchmail.org \
\r
326 - [subject]=notmuch-reply-test \
\r
327 - "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
\r
328 - by mail.notmuchmail.org (some MTA) with ESMTP id 12345678
\r
329 - for <test_suite_other@notmuchmail.org>; Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
\r
330 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
331 - '[body]="from guessing test"'
\r
332 + [to]=mailinglist@notmuchmail.org \
\r
333 + [subject]=notmuch-reply-test \
\r
334 + "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
\r
335 + by mail.notmuchmail.org (some MTA) with ESMTP id 12345678
\r
336 + for <test_suite_other@notmuchmail.org>; Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
\r
337 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
338 + '[body]="from guessing test"'
\r
340 output=$(notmuch reply id:${gen_msg_id})
\r
341 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
342 @@ -196,13 +196,13 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
344 test_begin_subtest "Magic from guessing (Received: domain)"
\r
345 add_message '[from]="Sender <sender@example.com>"' \
\r
346 - [to]=mailinglist@notmuchmail.org \
\r
347 - [subject]=notmuch-reply-test \
\r
348 - "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
\r
349 - by mail.otherdomain.org (some MTA) with ESMTP id 12345678
\r
350 - Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
\r
351 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
352 - '[body]="from guessing test"'
\r
353 + [to]=mailinglist@notmuchmail.org \
\r
354 + [subject]=notmuch-reply-test \
\r
355 + "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
\r
356 + by mail.otherdomain.org (some MTA) with ESMTP id 12345678
\r
357 + Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
\r
358 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
359 + '[body]="from guessing test"'
\r
361 output=$(notmuch reply id:${gen_msg_id})
\r
362 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
363 diff --git a/test/reply b/test/reply
\r
364 index c0b8e26..c0e9bd0 100755
\r
367 @@ -4,10 +4,10 @@ test_description="\"notmuch reply\" in several variations"
\r
369 test_begin_subtest "Basic reply"
\r
370 add_message '[from]="Sender <sender@example.com>"' \
\r
371 - [to]=test_suite@notmuchmail.org \
\r
372 - [subject]=notmuch-reply-test \
\r
373 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
374 - '[body]="basic reply test"'
\r
375 + [to]=test_suite@notmuchmail.org \
\r
376 + [subject]=notmuch-reply-test \
\r
377 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
378 + '[body]="basic reply test"'
\r
380 output=$(notmuch reply id:${gen_msg_id})
\r
381 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
382 @@ -21,10 +21,10 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
384 test_begin_subtest "Multiple recipients"
\r
385 add_message '[from]="Sender <sender@example.com>"' \
\r
386 - '[to]="test_suite@notmuchmail.org, Someone Else <someone@example.com>"' \
\r
387 - [subject]=notmuch-reply-test \
\r
388 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
389 - '[body]="Multiple recipients"'
\r
390 + '[to]="test_suite@notmuchmail.org, Someone Else <someone@example.com>"' \
\r
391 + [subject]=notmuch-reply-test \
\r
392 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
393 + '[body]="Multiple recipients"'
\r
395 output=$(notmuch reply id:${gen_msg_id})
\r
396 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
397 @@ -38,11 +38,11 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
399 test_begin_subtest "Reply with CC"
\r
400 add_message '[from]="Sender <sender@example.com>"' \
\r
401 - [to]=test_suite@notmuchmail.org \
\r
402 - '[cc]="Other Parties <cc@example.com>"' \
\r
403 - [subject]=notmuch-reply-test \
\r
404 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
405 - '[body]="reply with CC"'
\r
406 + [to]=test_suite@notmuchmail.org \
\r
407 + '[cc]="Other Parties <cc@example.com>"' \
\r
408 + [subject]=notmuch-reply-test \
\r
409 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
410 + '[body]="reply with CC"'
\r
412 output=$(notmuch reply id:${gen_msg_id})
\r
413 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
414 @@ -57,10 +57,10 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
416 test_begin_subtest "Reply from alternate address"
\r
417 add_message '[from]="Sender <sender@example.com>"' \
\r
418 - [to]=test_suite_other@notmuchmail.org \
\r
419 - [subject]=notmuch-reply-test \
\r
420 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
421 - '[body]="reply from alternate address"'
\r
422 + [to]=test_suite_other@notmuchmail.org \
\r
423 + [subject]=notmuch-reply-test \
\r
424 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
425 + '[body]="reply from alternate address"'
\r
427 output=$(notmuch reply id:${gen_msg_id})
\r
428 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
\r
429 @@ -74,11 +74,11 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
431 test_begin_subtest "Support for Reply-To"
\r
432 add_message '[from]="Sender <sender@example.com>"' \
\r
433 - [to]=test_suite@notmuchmail.org \
\r
434 - [subject]=notmuch-reply-test \
\r
435 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
436 - '[body]="support for reply-to"' \
\r
437 - '[reply-to]="Sender <elsewhere@example.com>"'
\r
438 + [to]=test_suite@notmuchmail.org \
\r
439 + [subject]=notmuch-reply-test \
\r
440 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
441 + '[body]="support for reply-to"' \
\r
442 + '[reply-to]="Sender <elsewhere@example.com>"'
\r
444 output=$(notmuch reply id:${gen_msg_id})
\r
445 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
446 @@ -92,11 +92,11 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
448 test_begin_subtest "Un-munging Reply-To"
\r
449 add_message '[from]="Sender <sender@example.com>"' \
\r
450 - '[to]="Some List <list@example.com>"' \
\r
451 - [subject]=notmuch-reply-test \
\r
452 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
453 - '[body]="Un-munging Reply-To"' \
\r
454 - '[reply-to]="Evil Munging List <list@example.com>"'
\r
455 + '[to]="Some List <list@example.com>"' \
\r
456 + [subject]=notmuch-reply-test \
\r
457 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
458 + '[body]="Un-munging Reply-To"' \
\r
459 + '[reply-to]="Evil Munging List <list@example.com>"'
\r
461 output=$(notmuch reply id:${gen_msg_id})
\r
462 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
463 @@ -110,8 +110,8 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
\r
465 test_begin_subtest "Message with header of exactly 200 bytes"
\r
466 add_message '[subject]="This subject is exactly 200 bytes in length. Other than its length there is not much of note here. Note that the length of 200 bytes includes the Subject: and Re: prefixes with two spaces"' \
\r
467 - '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
468 - '[body]="200-byte header"'
\r
469 + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
\r
470 + '[body]="200-byte header"'
\r
471 output=$(notmuch reply id:${gen_msg_id})
\r
472 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
473 Subject: Re: This subject is exactly 200 bytes in length. Other than its length there is not much of note here. Note that the length of 200 bytes includes the Subject: and Re: prefixes with two spaces
\r
474 diff --git a/test/search-position-overlap-bug b/test/search-position-overlap-bug
\r
475 index 414b8d5..5da6ad6 100755
\r
476 --- a/test/search-position-overlap-bug
\r
477 +++ b/test/search-position-overlap-bug
\r
479 #!/usr/bin/env bash
\r
481 # Test to demonstrate a position overlap bug.
\r
484 # At one point, notmuch would index terms incorrectly in the case of
\r
485 # calling index_terms multiple times for a single field. The term
\r
486 # generator was being reset to position 0 each time. This means that
\r
488 # one could get a bogus match by searching for:
\r
493 # Thanks to Mark Anderson for reporting the bug, (and providing a nice,
\r
494 # minimal test case that inspired what is used here), in
\r
495 # id:3wd4o8wa7fx.fsf@testarossa.amd.com
\r
496 diff --git a/test/symbol-hiding b/test/symbol-hiding
\r
497 index 7fa7b2a..636ec91 100755
\r
498 --- a/test/symbol-hiding
\r
499 +++ b/test/symbol-hiding
\r
500 @@ -23,7 +23,7 @@ mkdir -p fakedb/.notmuch
\r
501 test_expect_success 'running test' run_test
\r
503 test_begin_subtest 'checking output'
\r
504 -test_expect_equal "$result" "$output"
\r
505 +test_expect_equal "$result" "$output"
\r
507 test_begin_subtest 'comparing existing to exported symbols'
\r
508 objdump -t $TEST_DIRECTORY/../lib/*.o | awk '$4 == ".text" && $6 ~ "^notmuch" {print $6}' | sort | uniq > ACTUAL
\r
509 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
510 index 82767c0..3f4bd26 100644
\r
511 --- a/test/test-lib.sh
\r
512 +++ b/test/test-lib.sh
\r
513 @@ -140,7 +140,7 @@ if test -n "$color"; then
\r
522 @@ -150,7 +150,7 @@ else
\r
523 test -z "$1" && test -n "$quiet" && return
\r
531 @@ -249,7 +249,7 @@ remove_cr () {
\r
532 # Store the message in file 'name'. The default is to store it
\r
533 # in 'msg-<count>', where <count> is three-digit number of the
\r
539 # Text to use as the body of the email message
\r
540 @@ -869,7 +869,7 @@ test_done () {
\r
541 [ -n "$EMACS_SERVER" ] && test_emacs '(kill-emacs)'
\r
543 if [ "$test_failure" = "0" ]; then
\r
544 - if [ "$test_broken" = "0" ]; then
\r
545 + if [ "$test_broken" = "0" ]; then
\r
546 rm -rf "$remove_tmp"
\r
549 @@ -881,7 +881,7 @@ test_done () {
\r
550 emacs_generate_script () {
\r
551 # Construct a little test script here for the benefit of the user,
\r
552 # (who can easily run "run_emacs" to get the same emacs environment
\r
553 - # for investigating any failures).
\r
554 + # for investigating any failures).
\r
555 cat <<EOF >"$TMP_DIRECTORY/run_emacs"
\r
558 diff --git a/test/thread-naming b/test/thread-naming
\r
559 index 41b97d9..2ce9216 100755
\r
560 --- a/test/thread-naming
\r
561 +++ b/test/thread-naming
\r
562 @@ -4,18 +4,18 @@ test_description="naming of threads with changing subject"
\r
564 test_begin_subtest "Initial thread name (oldest-first search)"
\r
565 add_message '[subject]="thread-naming: Initial thread subject"' \
\r
566 - '[date]="Fri, 05 Jan 2001 15:43:56 -0000"'
\r
567 + '[date]="Fri, 05 Jan 2001 15:43:56 -0000"'
\r
568 first=${gen_msg_cnt}
\r
569 parent=${gen_msg_id}
\r
570 add_message '[subject]="thread-naming: Older changed subject"' \
\r
571 - '[date]="Sat, 06 Jan 2001 15:43:56 -0000"' \
\r
572 - "[in-reply-to]=\<$parent\>"
\r
573 + '[date]="Sat, 06 Jan 2001 15:43:56 -0000"' \
\r
574 + "[in-reply-to]=\<$parent\>"
\r
575 add_message '[subject]="thread-naming: Newer changed subject"' \
\r
576 - '[date]="Sun, 07 Jan 2001 15:43:56 -0000"' \
\r
577 - "[in-reply-to]=\<$parent\>"
\r
578 + '[date]="Sun, 07 Jan 2001 15:43:56 -0000"' \
\r
579 + "[in-reply-to]=\<$parent\>"
\r
580 add_message '[subject]="thread-naming: Final thread subject"' \
\r
581 - '[date]="Mon, 08 Jan 2001 15:43:56 -0000"' \
\r
582 - "[in-reply-to]=\<$parent\>"
\r
583 + '[date]="Mon, 08 Jan 2001 15:43:56 -0000"' \
\r
584 + "[in-reply-to]=\<$parent\>"
\r
585 final=${gen_msg_id}
\r
586 output=$(notmuch search --sort=oldest-first thread-naming and tag:inbox | notmuch_search_sanitize)
\r
587 test_expect_equal "$output" "thread:XXX 2001-01-05 [4/4] Notmuch Test Suite; thread-naming: Initial thread subject (inbox unread)"
\r
588 @@ -37,29 +37,29 @@ test_expect_equal "$output" "thread:XXX 2001-01-07 [2/4] Notmuch Test Suite; t
\r
590 test_begin_subtest "Ignore added reply prefix (Re:)"
\r
591 add_message '[subject]="Re: thread-naming: Initial thread subject"' \
\r
592 - '[date]="Tue, 09 Jan 2001 15:43:45 -0000"' \
\r
593 - "[in-reply-to]=\<$parent\>"
\r
594 + '[date]="Tue, 09 Jan 2001 15:43:45 -0000"' \
\r
595 + "[in-reply-to]=\<$parent\>"
\r
596 output=$(notmuch search --sort=newest-first thread-naming and tag:inbox | notmuch_search_sanitize)
\r
597 test_expect_equal "$output" "thread:XXX 2001-01-09 [3/5] Notmuch Test Suite; thread-naming: Initial thread subject (inbox unread)"
\r
599 test_begin_subtest "Ignore added reply prefix (Aw:)"
\r
600 add_message '[subject]="Aw: thread-naming: Initial thread subject"' \
\r
601 - '[date]="Wed, 10 Jan 2001 15:43:45 -0000"' \
\r
602 - "[in-reply-to]=\<$parent\>"
\r
603 + '[date]="Wed, 10 Jan 2001 15:43:45 -0000"' \
\r
604 + "[in-reply-to]=\<$parent\>"
\r
605 output=$(notmuch search --sort=newest-first thread-naming and tag:inbox | notmuch_search_sanitize)
\r
606 test_expect_equal "$output" "thread:XXX 2001-01-10 [4/6] Notmuch Test Suite; thread-naming: Initial thread subject (inbox unread)"
\r
608 test_begin_subtest "Ignore added reply prefix (Vs:)"
\r
609 add_message '[subject]="Vs: thread-naming: Initial thread subject"' \
\r
610 - '[date]="Thu, 11 Jan 2001 15:43:45 -0000"' \
\r
611 - "[in-reply-to]=\<$parent\>"
\r
612 + '[date]="Thu, 11 Jan 2001 15:43:45 -0000"' \
\r
613 + "[in-reply-to]=\<$parent\>"
\r
614 output=$(notmuch search --sort=newest-first thread-naming and tag:inbox | notmuch_search_sanitize)
\r
615 test_expect_equal "$output" "thread:XXX 2001-01-11 [5/7] Notmuch Test Suite; thread-naming: Initial thread subject (inbox unread)"
\r
617 test_begin_subtest "Ignore added reply prefix (Sv:)"
\r
618 add_message '[subject]="Sv: thread-naming: Initial thread subject"' \
\r
619 - '[date]="Fri, 12 Jan 2001 15:43:45 -0000"' \
\r
620 - "[in-reply-to]=\<$parent\>"
\r
621 + '[date]="Fri, 12 Jan 2001 15:43:45 -0000"' \
\r
622 + "[in-reply-to]=\<$parent\>"
\r
623 output=$(notmuch search --sort=newest-first thread-naming and tag:inbox | notmuch_search_sanitize)
\r
624 test_expect_equal "$output" "thread:XXX 2001-01-12 [6/8] Notmuch Test Suite; thread-naming: Initial thread subject (inbox unread)"
\r