1 Return-Path: <bremner@tethera.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 457ED431FD5
\r
6 for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:02:44 -0700 (PDT)
\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 ZnYbzCwrZlbu for <notmuch@notmuchmail.org>;
\r
16 Tue, 11 Mar 2014 16:02:42 -0700 (PDT)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 5DC65431FBF
\r
21 for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:02:28 -0700 (PDT)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tethera.net>)
\r
24 id 1WNVgp-0001vt-Sc; Tue, 11 Mar 2014 20:02:27 -0300
\r
25 Received: (nullmailer pid 25843 invoked by uid 1000); Tue, 11 Mar 2014
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [Patch v6 02/14] test: add notmuch_search_files_sanitize and use it
\r
30 Date: Tue, 11 Mar 2014 20:01:28 -0300
\r
31 Message-Id: <1394578900-25618-3-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 1.8.5.3
\r
33 In-Reply-To: <1394578900-25618-1-git-send-email-david@tethera.net>
\r
34 References: <1394578900-25618-1-git-send-email-david@tethera.net>
\r
35 X-BeenThere: notmuch@notmuchmail.org
\r
36 X-Mailman-Version: 2.1.13
\r
38 List-Id: "Use and development of the notmuch mail system."
\r
39 <notmuch.notmuchmail.org>
\r
40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
42 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
43 List-Post: <mailto:notmuch@notmuchmail.org>
\r
44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
47 X-List-Received-Date: Tue, 11 Mar 2014 23:02:44 -0000
\r
49 From: Jani Nikula <jani@nikula.org>
\r
51 We do this in a lot of places, so make it a helper in the test-lib.
\r
53 test/T090-search-output.sh | 8 ++++----
\r
54 test/T370-search-folder-coherence.sh | 2 +-
\r
55 test/test-lib.sh | 5 +++++
\r
56 3 files changed, 10 insertions(+), 5 deletions(-)
\r
58 diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh
\r
59 index 86544ac..a8ab920 100755
\r
60 --- a/test/T090-search-output.sh
\r
61 +++ b/test/T090-search-output.sh
\r
62 @@ -181,7 +181,7 @@ EOF
\r
63 test_expect_equal_file OUTPUT EXPECTED
\r
65 test_begin_subtest "--output=files"
\r
66 -notmuch search --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
\r
67 +notmuch search --output=files '*' | notmuch_search_files_sanitize >OUTPUT
\r
71 @@ -240,7 +240,7 @@ EOF
\r
72 test_expect_equal_file OUTPUT EXPECTED
\r
74 test_begin_subtest "--output=files --duplicate=1"
\r
75 -notmuch search --output=files --duplicate=1 '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
\r
76 +notmuch search --output=files --duplicate=1 '*' | notmuch_search_files_sanitize >OUTPUT
\r
80 @@ -298,7 +298,7 @@ EOF
\r
81 test_expect_equal_file OUTPUT EXPECTED
\r
83 test_begin_subtest "--output=files --format=json"
\r
84 -notmuch search --format=json --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
\r
85 +notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize >OUTPUT
\r
87 ["MAIL_DIR/cur/52:2,",
\r
88 "MAIL_DIR/cur/53:2,",
\r
89 @@ -357,7 +357,7 @@ EOF
\r
90 test_expect_equal_file OUTPUT EXPECTED
\r
92 test_begin_subtest "--output=files --format=json --duplicate=2"
\r
93 -notmuch search --format=json --output=files --duplicate=2 '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
\r
94 +notmuch search --format=json --output=files --duplicate=2 '*' | notmuch_search_files_sanitize >OUTPUT
\r
96 ["MAIL_DIR/cur/51:2,"]
\r
98 diff --git a/test/T370-search-folder-coherence.sh b/test/T370-search-folder-coherence.sh
\r
99 index 3f6ec76..5e72a6c 100755
\r
100 --- a/test/T370-search-folder-coherence.sh
\r
101 +++ b/test/T370-search-folder-coherence.sh
\r
102 @@ -27,7 +27,7 @@ cat <<EOF >EXPECTED
\r
104 MAIL_DIR/spam/msg-001
\r
106 -notmuch search --output=files id:$id_x | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
\r
107 +notmuch search --output=files id:$id_x | notmuch_search_files_sanitize >OUTPUT
\r
108 test_expect_equal_file OUTPUT EXPECTED
\r
110 test_begin_subtest "Test matches folder:spam"
\r
111 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
112 index 9824bb6..8697d6a 100644
\r
113 --- a/test/test-lib.sh
\r
114 +++ b/test/test-lib.sh
\r
115 @@ -667,6 +667,11 @@ notmuch_search_sanitize ()
\r
116 perl -pe 's/("?thread"?: ?)("?)................("?)/\1\2XXX\3/'
\r
119 +notmuch_search_files_sanitize()
\r
121 + sed -e "s,$MAIL_DIR,MAIL_DIR,"
\r
124 NOTMUCH_SHOW_FILENAME_SQUELCH='s,filename:.*/mail,filename:/XXX/mail,'
\r
125 notmuch_show_sanitize ()
\r