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 771E3429E28
\r
6 for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:23 -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 q0IDQn-ZriCi for <notmuch@notmuchmail.org>;
\r
17 Sat, 28 May 2011 14:52:22 -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 09839429E33
\r
21 for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:15 -0700 (PDT)
\r
22 Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
23 by fire-doxen-postvirus (Postfix) with ESMTP id 5F4D52E50E75;
\r
24 Sat, 28 May 2011 14:45:47 -0700 (PDT)
\r
25 X-Spam-Scanned: at Caltech-IMSS on fire-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 fire-doxen-submit (Postfix) with ESMTP id B5DB732808F;
\r
29 Sat, 28 May 2011 14:45:42 -0700 (PDT)
\r
30 Received: by servo.finestructure.net (Postfix, from userid 1000)
\r
31 id 298E5791; 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 07/25] test: remove json test for search null result, since it's being more properly tested in search-output
\r
35 Date: Sat, 28 May 2011 14:51:42 -0700
\r
36 Message-Id: <1306619520-25730-8-git-send-email-jrollins@finestructure.net>
\r
37 X-Mailer: git-send-email 1.7.4.4
\r
38 In-Reply-To: <1306619520-25730-7-git-send-email-jrollins@finestructure.net>
\r
39 References: <1306619520-25730-1-git-send-email-jrollins@finestructure.net>
\r
40 <1306619520-25730-2-git-send-email-jrollins@finestructure.net>
\r
41 <1306619520-25730-3-git-send-email-jrollins@finestructure.net>
\r
42 <1306619520-25730-4-git-send-email-jrollins@finestructure.net>
\r
43 <1306619520-25730-5-git-send-email-jrollins@finestructure.net>
\r
44 <1306619520-25730-6-git-send-email-jrollins@finestructure.net>
\r
45 <1306619520-25730-7-git-send-email-jrollins@finestructure.net>
\r
47 Content-Type: text/plain; charset=UTF-8
\r
48 Content-Transfer-Encoding: 8bit
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sat, 28 May 2011 21:52:23 -0000
\r
63 The test in json was inferior to the one in search-output, since it
\r
64 wasn't properly testing for the presence of a trailing newline.
\r
67 test/search-output | 4 +---
\r
68 2 files changed, 1 insertions(+), 7 deletions(-)
\r
70 diff --git a/test/json b/test/json
\r
71 index 0badb1d..5a2544c 100755
\r
74 @@ -34,8 +34,4 @@ test_expect_equal "$output" "[{\"thread\": \"XXX\",
\r
75 \"subject\": \"json-search-utf8-body-sübjéct\",
\r
76 \"tags\": [\"inbox\", \"unread\"]}]"
\r
78 -test_begin_subtest "Search returning no messages"
\r
79 -output=$(notmuch search --format=json "this string had better not match any messages" | notmuch_search_sanitize)
\r
80 -test_expect_equal "$output" "[]"
\r
83 diff --git a/test/search-output b/test/search-output
\r
84 index 8ba8acf..13f9613 100755
\r
85 --- a/test/search-output
\r
86 +++ b/test/search-output
\r
87 @@ -311,9 +311,7 @@ test_expect_equal_file OUTPUT EXPECTED
\r
89 test_begin_subtest "notmuch search --format=json for non-existent message prints proper empty json"
\r
90 notmuch search --format=json "no-message-matches-this" > OUTPUT
\r
91 -cat <<EOF >EXPECTED
\r
94 +echo "[]" >EXPECTED
\r
95 test_expect_equal_file OUTPUT EXPECTED
\r