1 Return-Path: <pieter@praet.org>
\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 C9779429E21
\r
6 for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 03:39:23 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\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 CHllZ0XFE6Uz for <notmuch@notmuchmail.org>;
\r
16 Wed, 16 Nov 2011 03:39:23 -0800 (PST)
\r
17 Received: from mail-wy0-f181.google.com (mail-wy0-f181.google.com
\r
18 [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 1408D431FB6
\r
21 for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 03:39:22 -0800 (PST)
\r
22 Received: by wyg19 with SMTP id 19so378729wyg.26
\r
23 for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 03:39:21 -0800 (PST)
\r
24 Received: by 10.216.138.221 with SMTP id a71mr5048002wej.102.1321443561546;
\r
25 Wed, 16 Nov 2011 03:39:21 -0800 (PST)
\r
26 Received: from localhost ([109.131.148.49])
\r
27 by mx.google.com with ESMTPS id b5sm32460209wbh.4.2011.11.16.03.39.20
\r
28 (version=TLSv1/SSLv3 cipher=OTHER);
\r
29 Wed, 16 Nov 2011 03:39:21 -0800 (PST)
\r
30 From: Pieter Praet <pieter@praet.org>
\r
31 To: David Bremner <david@tethera.net>
\r
32 Subject: [PATCH] test: emacs: tidy up "Stashing in notmuch-show" test
\r
33 Date: Wed, 16 Nov 2011 12:38:19 +0100
\r
34 Message-Id: <1321443499-10220-1-git-send-email-pieter@praet.org>
\r
35 X-Mailer: git-send-email 1.7.7.1
\r
36 In-Reply-To: <87obwg6d0r.fsf@zancas.localnet>
\r
37 References: <87obwg6d0r.fsf@zancas.localnet>
\r
38 Cc: Notmuch Mail <notmuch@notmuchmail.org>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Wed, 16 Nov 2011 11:39:23 -0000
\r
53 Merge expected output into the actual test, so we can verify the stashed
\r
54 filename using ${gen_msg_filename} instead of doing sed tricks.
\r
59 Here's a small update that was hanging out on one of my local branches.
\r
64 test/emacs | 14 ++++++++++++--
\r
65 test/emacs.expected-output/emacs-stashing | 9 ---------
\r
66 2 files changed, 12 insertions(+), 11 deletions(-)
\r
67 delete mode 100644 test/emacs.expected-output/emacs-stashing
\r
69 diff --git a/test/emacs b/test/emacs
\r
70 index 75a0a74..3bf2e29 100755
\r
73 @@ -369,8 +369,18 @@ test_emacs '(notmuch-show "id:\"bought\"")
\r
74 (rotate-yank-pointer 1))
\r
75 (reverse-region (point-min) (point-max))
\r
77 -sed -i -e 's/^.*tmp.emacs\/mail.*$/FILENAME/' OUTPUT
\r
78 -test_expect_equal_file OUTPUT $EXPECTED/emacs-stashing
\r
79 +cat <<EOF >EXPECTED
\r
80 +Sat, 01 Jan 2000 12:00:00 -0000
\r
81 +Some One <someone@somewhere.org>
\r
82 +Some One Else <notsomeone@somewhere.org>
\r
83 +Notmuch <notmuch@notmuchmail.org>
\r
84 +Stash my stashables
\r
88 +${gen_msg_filename}
\r
90 +test_expect_equal_file OUTPUT EXPECTED
\r
92 test_begin_subtest "Stashing in notmuch-search"
\r
93 test_emacs '(notmuch-search "id:\"bought\"")
\r
94 diff --git a/test/emacs.expected-output/emacs-stashing b/test/emacs.expected-output/emacs-stashing
\r
95 deleted file mode 100644
\r
96 index 4923594..0000000
\r
97 --- a/test/emacs.expected-output/emacs-stashing
\r
100 -Sat, 01 Jan 2000 12:00:00 -0000
\r
101 -Some One <someone@somewhere.org>
\r
102 -Some One Else <notsomeone@somewhere.org>
\r
103 -Notmuch <notmuch@notmuchmail.org>
\r
104 -Stash my stashables
\r