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 E9925429E43
\r
6 for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:17 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5
\r
12 tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]
\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 Owb2wwwbfLgh for <notmuch@notmuchmail.org>;
\r
17 Sat, 28 May 2011 14:52:16 -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 BD60D429E2A
\r
21 for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:13 -0700 (PDT)
\r
22 Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
23 by earth-doxen-postvirus (Postfix) with ESMTP id 4B07C66E019B;
\r
24 Sat, 28 May 2011 14:52:12 -0700 (PDT)
\r
25 X-Spam-Scanned: at Caltech-IMSS on earth-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 earth-doxen-submit (Postfix) with ESMTP id 4F6A366E024E;
\r
29 Sat, 28 May 2011 14:52:09 -0700 (PDT)
\r
30 Received: by servo.finestructure.net (Postfix, from userid 1000)
\r
31 id 39B2B7D6; 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 12/25] test: cleanup search-output test names (no functional
\r
36 Date: Sat, 28 May 2011 14:51:47 -0700
\r
37 Message-Id: <1306619520-25730-13-git-send-email-jrollins@finestructure.net>
\r
38 X-Mailer: git-send-email 1.7.4.4
\r
39 In-Reply-To: <1306619520-25730-12-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 <1306619520-25730-4-git-send-email-jrollins@finestructure.net>
\r
44 <1306619520-25730-5-git-send-email-jrollins@finestructure.net>
\r
45 <1306619520-25730-6-git-send-email-jrollins@finestructure.net>
\r
46 <1306619520-25730-7-git-send-email-jrollins@finestructure.net>
\r
47 <1306619520-25730-8-git-send-email-jrollins@finestructure.net>
\r
48 <1306619520-25730-9-git-send-email-jrollins@finestructure.net>
\r
49 <1306619520-25730-10-git-send-email-jrollins@finestructure.net>
\r
50 <1306619520-25730-11-git-send-email-jrollins@finestructure.net>
\r
51 <1306619520-25730-12-git-send-email-jrollins@finestructure.net>
\r
52 X-BeenThere: notmuch@notmuchmail.org
\r
53 X-Mailman-Version: 2.1.13
\r
55 List-Id: "Use and development of the notmuch mail system."
\r
56 <notmuch.notmuchmail.org>
\r
57 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
59 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
60 List-Post: <mailto:notmuch@notmuchmail.org>
\r
61 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
62 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
64 X-List-Received-Date: Sat, 28 May 2011 21:52:18 -0000
\r
66 Signed-off-by: Jameson Graef Rollins <jrollins@finestructure.net>
\r
68 test/search-output | 20 ++++++++++----------
\r
69 1 files changed, 10 insertions(+), 10 deletions(-)
\r
71 diff --git a/test/search-output b/test/search-output
\r
72 index 8edc26a..02cf602 100755
\r
73 --- a/test/search-output
\r
74 +++ b/test/search-output
\r
75 @@ -4,7 +4,7 @@ test_description='various settings for "notmuch search --output="'
\r
79 -test_begin_subtest "notmuch search --output=threads"
\r
80 +test_begin_subtest "--output=threads"
\r
81 notmuch search --output=threads '*' | sed -e s/thread:.*/thread:THREADID/ >OUTPUT
\r
84 @@ -32,7 +32,7 @@ thread:THREADID
\r
86 test_expect_equal_file OUTPUT EXPECTED
\r
88 -test_begin_subtest "notmuch search --format=json --output=threads"
\r
89 +test_begin_subtest "--output=threads --format=json"
\r
90 notmuch search --format=json --output=threads '*' | sed -e s/\".*\"/\"THREADID\"/ >OUTPUT
\r
93 @@ -60,7 +60,7 @@ cat <<EOF >EXPECTED
\r
95 test_expect_equal_file OUTPUT EXPECTED
\r
97 -test_begin_subtest "notmuch search --output=messages"
\r
98 +test_begin_subtest "--output=messages"
\r
99 notmuch search --output=messages '*' >OUTPUT
\r
100 cat <<EOF >EXPECTED
\r
101 id:1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk
\r
102 @@ -116,7 +116,7 @@ id:1258471718-6781-1-git-send-email-dottedmag@dottedmag.net
\r
104 test_expect_equal_file OUTPUT EXPECTED
\r
106 -test_begin_subtest "notmuch search --format=json --output=messages"
\r
107 +test_begin_subtest "--output=messages --format=json"
\r
108 notmuch search --format=json --output=messages '*' >OUTPUT
\r
109 cat <<EOF >EXPECTED
\r
110 ["1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk",
\r
111 @@ -172,7 +172,7 @@ cat <<EOF >EXPECTED
\r
113 test_expect_equal_file OUTPUT EXPECTED
\r
115 -test_begin_subtest "notmuch search --output=files"
\r
116 +test_begin_subtest "--output=files"
\r
117 notmuch search --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
\r
118 cat <<EOF >EXPECTED
\r
120 @@ -228,7 +228,7 @@ MAIL_DIR/cur/01:2,
\r
122 test_expect_equal_file OUTPUT EXPECTED
\r
124 -test_begin_subtest "notmuch search --format=json --output=files"
\r
125 +test_begin_subtest "--output=files --format=json"
\r
126 notmuch search --format=json --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT
\r
127 cat <<EOF >EXPECTED
\r
128 ["MAIL_DIR/cur/50:2,",
\r
129 @@ -284,7 +284,7 @@ cat <<EOF >EXPECTED
\r
131 test_expect_equal_file OUTPUT EXPECTED
\r
133 -test_begin_subtest "notmuch search --output=tags"
\r
134 +test_begin_subtest "--output=tags"
\r
135 notmuch search --output=tags '*' >OUTPUT
\r
136 cat <<EOF >EXPECTED
\r
138 @@ -294,7 +294,7 @@ unread
\r
140 test_expect_equal_file OUTPUT EXPECTED
\r
142 -test_begin_subtest "notmuch search --format=json --output=tags"
\r
143 +test_begin_subtest "--output=tags --format=json"
\r
144 notmuch search --format=json --output=tags '*' >OUTPUT
\r
145 cat <<EOF >EXPECTED
\r
147 @@ -313,12 +313,12 @@ thread:000000000000001b 2001-01-05 [1/1] Notmuch Test Suite; two line? subject
\r
149 test_expect_equal_file OUTPUT EXPECTED
\r
151 -test_begin_subtest "notmuch search for non-existent message prints nothing"
\r
152 +test_begin_subtest "search for non-existent message prints nothing"
\r
153 notmuch search "no-message-matches-this" > OUTPUT
\r
155 test_expect_equal_file OUTPUT EXPECTED
\r
157 -test_begin_subtest "notmuch search --format=json for non-existent message prints proper empty json"
\r
158 +test_begin_subtest "search --format=json for non-existent message prints proper empty json"
\r
159 notmuch search --format=json "no-message-matches-this" > OUTPUT
\r
160 echo "[]" >EXPECTED
\r
161 test_expect_equal_file OUTPUT EXPECTED
\r