1 Return-Path: <dmitry.kurochkin@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 E66E1429E4D
\r
6 for <notmuch@notmuchmail.org>; Mon, 27 Jun 2011 21:45:38 -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 xgc+z4Rf9Rde for <notmuch@notmuchmail.org>;
\r
17 Mon, 27 Jun 2011 21:45:36 -0700 (PDT)
\r
18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com
\r
19 [209.85.214.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 73546429E52
\r
22 for <notmuch@notmuchmail.org>; Mon, 27 Jun 2011 21:45:36 -0700 (PDT)
\r
23 Received: by mail-bw0-f53.google.com with SMTP id 12so4889638bwg.26
\r
24 for <notmuch@notmuchmail.org>; Mon, 27 Jun 2011 21:45:36 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer
\r
27 :in-reply-to:references;
\r
28 bh=DhY71xJvQmQdmydEpQ3Xp0ZbaOb/2BSTwh3Y3fQE9mY=;
\r
29 b=QnwuWrV4v9tJ7j9Af3J4NJaKhpbEDktXPBnbgUR89q/9wxgItGxY6IZFoyNsmrFCvV
\r
30 8Cf9ytvnyGamyTWGupOgD78Y55GZe7pkMNkefkylBfX66KbN/ZCiTD5gqL5cdndfnrS1
\r
31 Q8Fbu3DihY4gaRFW47OKvKOuWFH0Xek9EPN6U=
\r
32 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
\r
33 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
34 b=QKvxLVa/5veZB0ajkIVkEyMsm4aGr6IW+WDbuQJdRDmKIvFfsSW/Pi1UKw27AOMakp
\r
35 V1M9Jm0K1/9ozmbYQUwKLFCxXFg26Ix4tuXFVuERMcbWngqHdEF/VCvJ9rUYjR+rKQE2
\r
36 uQDQ8jGR9p81yE+MxcIufa5fbgbJoWMXh8eZs=
\r
37 Received: by 10.205.82.80 with SMTP id ab16mr5101430bkc.66.1309236336045;
\r
38 Mon, 27 Jun 2011 21:45:36 -0700 (PDT)
\r
39 Received: from localhost ([91.144.186.21])
\r
40 by mx.google.com with ESMTPS id n3sm4742316bka.16.2011.06.27.21.45.34
\r
41 (version=TLSv1/SSLv3 cipher=OTHER);
\r
42 Mon, 27 Jun 2011 21:45:35 -0700 (PDT)
\r
43 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
44 To: notmuch@notmuchmail.org
\r
45 Subject: [PATCH 04/10] test: wrap and indent test_emacs calls
\r
46 Date: Tue, 28 Jun 2011 08:45:05 +0400
\r
47 Message-Id: <1309236311-2162-4-git-send-email-dmitry.kurochkin@gmail.com>
\r
48 X-Mailer: git-send-email 1.7.5.4
\r
49 In-Reply-To: <1309236311-2162-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
50 References: <1309236311-2162-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
51 X-BeenThere: notmuch@notmuchmail.org
\r
52 X-Mailman-Version: 2.1.13
\r
54 List-Id: "Use and development of the notmuch mail system."
\r
55 <notmuch.notmuchmail.org>
\r
56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
59 List-Post: <mailto:notmuch@notmuchmail.org>
\r
60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
63 X-List-Received-Date: Tue, 28 Jun 2011 04:45:39 -0000
\r
65 Most test_emacs calls have long arguments that consist of many
\r
66 expressions. Putting them on a single line makes it hard to read
\r
67 and produces poor diff when they are changed. The patch puts
\r
68 every expression in test_emacs calls on a separate line.
\r
70 test/emacs | 124 ++++++++++++++++++++++++++++++++++++++++++++----------
\r
71 test/test-lib.sh | 14 ++++++-
\r
72 2 files changed, 114 insertions(+), 24 deletions(-)
\r
74 diff --git a/test/emacs b/test/emacs
\r
75 index f4ff3f1..fddb4a1 100755
\r
78 @@ -7,32 +7,51 @@ EXPECTED=../emacs.expected-output
\r
81 test_begin_subtest "Basic notmuch-hello view in emacs"
\r
82 -test_emacs '(notmuch-hello) (princ (buffer-string))' >OUTPUT
\r
83 +test_emacs '(notmuch-hello)
\r
84 + (princ (buffer-string))' >OUTPUT
\r
85 test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello
\r
87 test_begin_subtest "Saved search with 0 results"
\r
88 -test_emacs '(setq notmuch-show-empty-saved-searches t) (setq notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" . "tag:unread") ("empty" . "tag:doesnotexist"))) (notmuch-hello) (princ (buffer-string))' >OUTPUT
\r
89 +test_emacs '(setq notmuch-show-empty-saved-searches t)
\r
90 + (setq notmuch-saved-searches
\r
91 + '\''(("inbox" . "tag:inbox")
\r
92 + ("unread" . "tag:unread")
\r
93 + ("empty" . "tag:doesnotexist")))
\r
95 + (princ (buffer-string))' >OUTPUT
\r
96 test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-with-empty
\r
98 test_begin_subtest "No saved searches displayed (all with 0 results)"
\r
99 -test_emacs '(setq notmuch-saved-searches '\''(("empty" . "tag:doesnotexist"))) (notmuch-hello) (princ (buffer-string))' >OUTPUT
\r
100 +test_emacs '(setq notmuch-saved-searches
\r
101 + '\''(("empty" . "tag:doesnotexist")))
\r
103 + (princ (buffer-string))' >OUTPUT
\r
104 test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-no-saved-searches
\r
106 test_begin_subtest "Basic notmuch-search view in emacs"
\r
107 -test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (princ (buffer-string))' >OUTPUT
\r
108 +test_emacs '(notmuch-search "tag:inbox")
\r
109 + (notmuch-test-wait)
\r
110 + (princ (buffer-string))' >OUTPUT
\r
111 test_expect_equal_file OUTPUT $EXPECTED/notmuch-search-tag-inbox
\r
113 test_begin_subtest "Navigation of notmuch-hello to search results"
\r
114 -test_emacs '(notmuch-hello) (goto-char (point-min)) (re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait) (princ (buffer-string))' >OUTPUT
\r
115 +test_emacs '(notmuch-hello)
\r
116 + (goto-char (point-min))
\r
117 + (re-search-forward "inbox")
\r
118 + (widget-button-press (point))
\r
119 + (notmuch-test-wait)
\r
120 + (princ (buffer-string))' >OUTPUT
\r
121 test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-view-inbox
\r
123 test_begin_subtest "Basic notmuch-show view in emacs"
\r
124 maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
\r
125 -test_emacs "(notmuch-show \"$maildir_storage_thread\") (princ (buffer-string))" >OUTPUT
\r
126 +test_emacs "(notmuch-show \"$maildir_storage_thread\")
\r
127 + (princ (buffer-string))" >OUTPUT
\r
128 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
\r
130 test_begin_subtest "notmuch-show for message with invalid From"
\r
131 -add_message "[subject]=\"message-with-invalid-from\"" "[from]=\"\\\"Invalid \\\" From\\\" <test_suite@notmuchmail.org>\""
\r
132 +add_message "[subject]=\"message-with-invalid-from\"" \
\r
133 + "[from]=\"\\\"Invalid \\\" From\\\" <test_suite@notmuchmail.org>\""
\r
134 thread=$(notmuch search --output=threads subject:message-with-invalid-from)
\r
135 output=$(test_emacs "(notmuch-show \"$thread\") (princ (buffer-string))")
\r
136 test_expect_equal "$output" \
\r
137 @@ -44,33 +63,54 @@ Date: Tue, 05 Jan 2001 15:43:57 -0000
\r
138 This is just a test message (#1)'
\r
140 test_begin_subtest "Navigation of notmuch-search to thread view"
\r
141 -test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (goto-char (point-min)) (re-search-forward "Working with Maildir") (notmuch-search-show-thread) (notmuch-test-wait) (princ (buffer-string))' >OUTPUT
\r
142 +test_emacs '(notmuch-search "tag:inbox")
\r
143 + (notmuch-test-wait)
\r
144 + (goto-char (point-min))
\r
145 + (re-search-forward "Working with Maildir")
\r
146 + (notmuch-search-show-thread)
\r
147 + (notmuch-test-wait)
\r
148 + (princ (buffer-string))' >OUTPUT
\r
149 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
\r
151 test_begin_subtest "Add tag from search view"
\r
152 os_x_darwin_thread=$(notmuch search --output=threads id:ddd65cda0911171950o4eea4389v86de9525e46052d3@mail.gmail.com)
\r
153 -test_emacs "(notmuch-search \"$os_x_darwin_thread\") (notmuch-test-wait) (notmuch-search-add-tag \"tag-from-search-view\")"
\r
154 +test_emacs "(notmuch-search \"$os_x_darwin_thread\")
\r
155 + (notmuch-test-wait)
\r
156 + (notmuch-search-add-tag \"tag-from-search-view\")"
\r
157 output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)
\r
158 test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-search-view unread)"
\r
160 test_begin_subtest "Remove tag from search view"
\r
161 -test_emacs "(notmuch-search \"$os_x_darwin_thread\") (notmuch-test-wait) (notmuch-search-remove-tag \"tag-from-search-view\")"
\r
162 +test_emacs "(notmuch-search \"$os_x_darwin_thread\")
\r
163 + (notmuch-test-wait)
\r
164 + (notmuch-search-remove-tag \"tag-from-search-view\")"
\r
165 output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)
\r
166 test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)"
\r
168 test_begin_subtest "Add tag from notmuch-show view"
\r
169 -test_emacs "(notmuch-show \"$os_x_darwin_thread\") (notmuch-show-add-tag \"tag-from-show-view\")"
\r
170 +test_emacs "(notmuch-show \"$os_x_darwin_thread\")
\r
171 + (notmuch-show-add-tag \"tag-from-show-view\")"
\r
172 output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)
\r
173 test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-show-view unread)"
\r
175 test_begin_subtest "Remove tag from notmuch-show view"
\r
176 -test_emacs "(notmuch-show \"$os_x_darwin_thread\") (notmuch-show-remove-tag \"tag-from-show-view\")"
\r
177 +test_emacs "(notmuch-show \"$os_x_darwin_thread\")
\r
178 + (notmuch-show-remove-tag \"tag-from-show-view\")"
\r
179 output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)
\r
180 test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)"
\r
182 test_begin_subtest "Message with .. in Message-Id:"
\r
183 add_message [id]=123..456@example '[subject]="Message with .. in Message-Id"'
\r
184 -test_emacs '(notmuch-search "id:\"123..456@example\"") (notmuch-test-wait) (notmuch-search-add-tag "search-add") (notmuch-search-add-tag "search-remove") (notmuch-search-remove-tag "search-remove") (notmuch-show "id:\"123..456@example\"") (notmuch-test-wait) (notmuch-show-add-tag "show-add") (notmuch-show-add-tag "show-remove") (notmuch-show-remove-tag "show-remove")'
\r
185 +test_emacs '(notmuch-search "id:\"123..456@example\"")
\r
186 + (notmuch-test-wait)
\r
187 + (notmuch-search-add-tag "search-add")
\r
188 + (notmuch-search-add-tag "search-remove")
\r
189 + (notmuch-search-remove-tag "search-remove")
\r
190 + (notmuch-show "id:\"123..456@example\"")
\r
191 + (notmuch-test-wait)
\r
192 + (notmuch-show-add-tag "show-add")
\r
193 + (notmuch-show-add-tag "show-remove")
\r
194 + (notmuch-show-remove-tag "show-remove")'
\r
195 output=$(notmuch search 'id:"123..456@example"' | notmuch_search_sanitize)
\r
196 test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Message with .. in Message-Id (inbox search-add show-add)"
\r
198 @@ -83,7 +123,18 @@ mkdir -p mail/sent/tmp
\r
200 ../smtp-dummy sent_message &
\r
202 -test_emacs "(setq message-send-mail-function 'message-smtpmail-send-it) (setq smtpmail-smtp-server \"localhost\") (setq smtpmail-smtp-service \"25025\") (notmuch-hello) (notmuch-mua-mail) (message-goto-to) (insert \"user@example.com\nDate: Fri, 29 Mar 1974 10:00:00 -0000\") (message-goto-subject) (insert \"Testing message sent via SMTP\") (message-goto-body) (insert \"This is a test that messages are sent via SMTP\") (message-send-and-exit)" >/dev/null 2>&1
\r
203 +test_emacs "(setq message-send-mail-function 'message-smtpmail-send-it)
\r
204 + (setq smtpmail-smtp-server \"localhost\")
\r
205 + (setq smtpmail-smtp-service \"25025\")
\r
207 + (notmuch-mua-mail)
\r
208 + (message-goto-to)
\r
209 + (insert \"user@example.com\nDate: Fri, 29 Mar 1974 10:00:00 -0000\")
\r
210 + (message-goto-subject)
\r
211 + (insert \"Testing message sent via SMTP\")
\r
212 + (message-goto-body)
\r
213 + (insert \"This is a test that messages are sent via SMTP\")
\r
214 + (message-send-and-exit)" >/dev/null 2>&1
\r
215 wait ${smtp_dummy_pid}
\r
218 @@ -109,7 +160,9 @@ output=$(notmuch search 'subject:"testing message sent via SMTP"' | notmuch_sear
\r
219 test_expect_equal "$output" "thread:XXX 1974-03-29 [1/1] Notmuch Test Suite; Testing message sent via SMTP (inbox)"
\r
221 test_begin_subtest "notmuch-fcc-dirs set to nil"
\r
222 -test_emacs "(setq notmuch-fcc-dirs nil) (notmuch-mua-mail) (princ (buffer-string))" > OUTPUT
\r
223 +test_emacs "(setq notmuch-fcc-dirs nil)
\r
224 + (notmuch-mua-mail)
\r
225 + (princ (buffer-string))" > OUTPUT
\r
226 cat <<EOF >EXPECTED
\r
227 From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
229 @@ -124,7 +177,9 @@ mkdir -p mail/sent-string/new
\r
230 mkdir -p mail/sent-string/tmp
\r
232 test_begin_subtest "notmuch-fcc-dirs set to a string"
\r
233 -test_emacs "(setq notmuch-fcc-dirs \"sent-string\") (notmuch-mua-mail) (princ (buffer-string))" > OUTPUT
\r
234 +test_emacs "(setq notmuch-fcc-dirs \"sent-string\")
\r
235 + (notmuch-mua-mail)
\r
236 + (princ (buffer-string))" > OUTPUT
\r
237 cat <<EOF >EXPECTED
\r
238 From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
240 @@ -143,7 +198,11 @@ mkdir -p mail/failure/new
\r
241 mkdir -p mail/failure/tmp
\r
243 test_begin_subtest "notmuch-fcc-dirs set to a list (with match)"
\r
244 -test_emacs "(setq notmuch-fcc-dirs '((\"notmuchmail.org\" . \"sent-list-match\") (\".*\" . \"failure\"))) (notmuch-mua-mail) (princ (buffer-string))" > OUTPUT
\r
245 +test_emacs "(setq notmuch-fcc-dirs
\r
246 + '((\"notmuchmail.org\" . \"sent-list-match\")
\r
247 + (\".*\" . \"failure\")))
\r
248 + (notmuch-mua-mail)
\r
249 + (princ (buffer-string))" > OUTPUT
\r
250 cat <<EOF >EXPECTED
\r
251 From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
253 @@ -159,7 +218,11 @@ mkdir -p mail/sent-list-catch-all/new
\r
254 mkdir -p mail/sent-list-catch-all/tmp
\r
256 test_begin_subtest "notmuch-fcc-dirs set to a list (catch-all)"
\r
257 -test_emacs "(setq notmuch-fcc-dirs '((\"example.com\" . \"failure\") (\".*\" . \"sent-list-catch-all\"))) (notmuch-mua-mail) (princ (buffer-string))" > OUTPUT
\r
258 +test_emacs "(setq notmuch-fcc-dirs
\r
259 + '((\"example.com\" . \"failure\")
\r
260 + (\".*\" . \"sent-list-catch-all\")))
\r
261 + (notmuch-mua-mail)
\r
262 + (princ (buffer-string))" > OUTPUT
\r
263 cat <<EOF >EXPECTED
\r
264 From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
266 @@ -170,7 +233,11 @@ EOF
\r
267 test_expect_equal_file OUTPUT EXPECTED
\r
269 test_begin_subtest "notmuch-fcc-dirs set to a list (no match)"
\r
270 -test_emacs "(setq notmuch-fcc-dirs '((\"example.com\" . \"failure\") (\"nomatchhere.net\" . \"failure\"))) (notmuch-mua-mail) (princ (buffer-string))" > OUTPUT
\r
271 +test_emacs "(setq notmuch-fcc-dirs
\r
272 + '((\"example.com\" . \"failure\")
\r
273 + (\"nomatchhere.net\" . \"failure\")))
\r
274 + (notmuch-mua-mail)
\r
275 + (princ (buffer-string))" > OUTPUT
\r
276 cat <<EOF >EXPECTED
\r
277 From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
279 @@ -182,7 +249,12 @@ test_expect_equal_file OUTPUT EXPECTED
\r
280 test_begin_subtest "Reply within emacs"
\r
281 # We sed away everything before the ^From in the output to avoid getting
\r
282 # confused by messages such as "Parsing /home/cworth/.mailrc... done"
\r
283 -test_emacs '(notmuch-search "subject:\"testing message sent via SMTP\"") (notmuch-test-wait) (notmuch-search-reply-to-thread) (princ (buffer-string))' | sed -ne '/^From/,$ p' | sed -e 's/^In-Reply-To: <.*>$/In-Reply-To: <XXX>/' >OUTPUT
\r
284 +test_emacs '(notmuch-search "subject:\"testing message sent via SMTP\"")
\r
285 + (notmuch-test-wait)
\r
286 + (notmuch-search-reply-to-thread)
\r
287 + (princ (buffer-string))' |
\r
288 +sed -ne '/^From/,$ p' |
\r
289 +sed -e 's/^In-Reply-To: <.*>$/In-Reply-To: <XXX>/' >OUTPUT
\r
290 cat <<EOF >EXPECTED
\r
291 From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
292 To: user@example.com
\r
293 @@ -197,17 +269,23 @@ test_expect_equal_file OUTPUT EXPECTED
\r
295 test_begin_subtest "Save attachment from within emacs using notmuch-show-save-attachments"
\r
296 # save as archive to test that Emacs does not re-compress .gz
\r
297 -echo ./attachment1.gz | test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com") (notmuch-show-save-attachments)' > /dev/null 2>&1
\r
298 +echo ./attachment1.gz |
\r
299 +test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com")
\r
300 + (notmuch-show-save-attachments)' > /dev/null 2>&1
\r
301 test_expect_equal_file attachment1.gz "$EXPECTED/attachment"
\r
303 test_begin_subtest "Save attachment from within emacs using notmuch-show-save-part"
\r
304 # save as archive to test that Emacs does not re-compress .gz
\r
305 -echo ./attachment2.gz | test_emacs '(notmuch-show-save-part "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com" 5)' > /dev/null 2>&1
\r
306 +echo ./attachment2.gz |
\r
307 +test_emacs '(notmuch-show-save-part "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com" 5)' > /dev/null 2>&1
\r
308 test_expect_equal_file attachment2.gz "$EXPECTED/attachment"
\r
310 test_begin_subtest "View raw message within emacs"
\r
311 first_line=$(head -n1 $EXPECTED/raw-message-cf0c4d-52ad0a)
\r
312 -test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com") (notmuch-show-view-raw-message) (princ (buffer-string))' | sed -ne "/$first_line/,\$ p" >OUTPUT
\r
313 +test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com")
\r
314 + (notmuch-show-view-raw-message)
\r
315 + (princ (buffer-string))' |
\r
316 +sed -ne "/$first_line/,\$ p" >OUTPUT
\r
317 test_expect_equal_file OUTPUT $EXPECTED/raw-message-cf0c4d-52ad0a
\r
319 test_begin_subtest "Hiding/showing signature in notmuch-show view"
\r
320 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
321 index 5f61960..ad1506c 100755
\r
322 --- a/test/test-lib.sh
\r
323 +++ b/test/test-lib.sh
\r
324 @@ -394,7 +394,19 @@ emacs_deliver_message ()
\r
325 mkdir -p "$MAIL_DIR"/sent/{cur,new,tmp}
\r
326 ../smtp-dummy sent_message &
\r
328 - test_emacs "(setq message-send-mail-function 'message-smtpmail-send-it) (setq smtpmail-smtp-server \"localhost\") (setq smtpmail-smtp-service \"25025\") (notmuch-hello) (notmuch-mua-mail) (message-goto-to) (insert \"test_suite@notmuchmail.org\nDate: 01 Jan 2000 12:00:00 -0000\") (message-goto-subject) (insert \"${subject}\") (message-goto-body) (insert \"${body}\") $@ (message-send-and-exit)" >/dev/null 2>&1
\r
329 + test_emacs "(setq message-send-mail-function 'message-smtpmail-send-it)
\r
330 + (setq smtpmail-smtp-server \"localhost\")
\r
331 + (setq smtpmail-smtp-service \"25025\")
\r
333 + (notmuch-mua-mail)
\r
334 + (message-goto-to)
\r
335 + (insert \"test_suite@notmuchmail.org\nDate: 01 Jan 2000 12:00:00 -0000\")
\r
336 + (message-goto-subject)
\r
337 + (insert \"${subject}\")
\r
338 + (message-goto-body)
\r
339 + (insert \"${body}\")
\r
341 + (message-send-and-exit)" >/dev/null 2>&1
\r
342 wait ${smtp_dummy_pid}
\r
343 notmuch new >/dev/null
\r