1 Return-Path: <jani@nikula.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 2CB1E431FC0
\r
6 for <notmuch@notmuchmail.org>; Tue, 4 Dec 2012 13:26:43 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[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 95B912dS3Qxm for <notmuch@notmuchmail.org>;
\r
17 Tue, 4 Dec 2012 13:26:42 -0800 (PST)
\r
18 Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com
\r
19 [209.85.217.181]) (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 7B57C431FB6
\r
22 for <notmuch@notmuchmail.org>; Tue, 4 Dec 2012 13:26:42 -0800 (PST)
\r
23 Received: by mail-lb0-f181.google.com with SMTP id ge1so3919565lbb.26
\r
24 for <notmuch@notmuchmail.org>; Tue, 04 Dec 2012 13:26:41 -0800 (PST)
\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=google.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
\r
28 :in-reply-to:references:x-gm-message-state;
\r
29 bh=V0UK6AjaxxuTt0vfJ7CFE7VWo5RM0qoGTbLCcjMFEhM=;
\r
30 b=XsJNwXwdKWfg2JfNLaN94p5J039OKh16S4EKWgGsct3PiZE+Bjvh/BImkY5OctSnOh
\r
31 DeQqOOsQZnjmWwHJipQLaFSkvlLYHQq+JSawt+RN+mW6/UkiaNc/C8PWE/BzjVqJxNNI
\r
32 1SAv8auzYuRDPKu+WGhjHuomS7Ar0x360VptFGq6j8tvHqyq1k+c5MlgK9MDCdIOFHR1
\r
33 9duBUGnSMLC4ELpgP+S/PFHOSsYwFjk6F/YUb0Q/yGKtO8qcIdBXtjVEp/4vp8lJDfXY
\r
34 9Wc/VSkUx1JbIxeA8pTt3wNQCnCzmBmctoe9PmZdMWL0NB2T7w7H0RjHKcxlWOM2GTRh
\r
36 Received: by 10.152.111.68 with SMTP id ig4mr14582442lab.50.1354656400948;
\r
37 Tue, 04 Dec 2012 13:26:40 -0800 (PST)
\r
38 Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.
\r
40 by mx.google.com with ESMTPS id oj5sm1190391lab.8.2012.12.04.13.26.39
\r
41 (version=SSLv3 cipher=OTHER); Tue, 04 Dec 2012 13:26:40 -0800 (PST)
\r
42 From: Jani Nikula <jani@nikula.org>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH 1/3] test: fix count test
\r
45 Date: Tue, 4 Dec 2012 23:26:31 +0200
\r
47 <0ca075ab5fb0d886d0235c1f0549db8b0b14c9b5.1354656085.git.jani@nikula.org>
\r
48 X-Mailer: git-send-email 1.7.10.4
\r
49 In-Reply-To: <cover.1354656085.git.jani@nikula.org>
\r
50 References: <cover.1354656085.git.jani@nikula.org>
\r
51 In-Reply-To: <cover.1354656085.git.jani@nikula.org>
\r
52 References: <cover.1354656085.git.jani@nikula.org>
\r
54 ALoCoQnzglNwmwuCCD3oBdRyjLyjqrTkNVWynIU3pSGkUSY6s3qdUWf++FKch6kBtf8pq5ZsHMRV
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Tue, 04 Dec 2012 21:26:43 -0000
\r
69 The quoting for ${SEARCH} is broken when it's supposed to be '*', and
\r
70 it seems tricky to get it right. Just drop the variable and use '*'
\r
71 directly. Before this, none of the messages ever matched, and the test
\r
72 was comparing zeros.
\r
74 test/count | 23 ++++++++++-------------
\r
75 1 file changed, 10 insertions(+), 13 deletions(-)
\r
77 diff --git a/test/count b/test/count
\r
78 index 300b171..8e587ff 100755
\r
81 @@ -4,37 +4,34 @@ test_description='"notmuch count" for messages and threads'
\r
87 test_begin_subtest "message count is the default for notmuch count"
\r
89 - "`notmuch search --output=messages ${SEARCH} | wc -l`" \
\r
90 - "`notmuch count ${SEARCH}`"
\r
91 + "`notmuch search --output=messages '*' | wc -l`" \
\r
92 + "`notmuch count '*'`"
\r
94 test_begin_subtest "message count with --output=messages"
\r
96 - "`notmuch search --output=messages ${SEARCH} | wc -l`" \
\r
97 - "`notmuch count --output=messages ${SEARCH}`"
\r
98 + "`notmuch search --output=messages '*' | wc -l`" \
\r
99 + "`notmuch count --output=messages '*'`"
\r
101 test_begin_subtest "thread count with --output=threads"
\r
102 test_expect_equal \
\r
103 - "`notmuch search --output=threads ${SEARCH} | wc -l`" \
\r
104 - "`notmuch count --output=threads ${SEARCH}`"
\r
105 + "`notmuch search --output=threads '*' | wc -l`" \
\r
106 + "`notmuch count --output=threads '*'`"
\r
108 test_begin_subtest "thread count is the default for notmuch search"
\r
109 test_expect_equal \
\r
110 - "`notmuch search ${SEARCH} | wc -l`" \
\r
111 - "`notmuch count --output=threads ${SEARCH}`"
\r
112 + "`notmuch search '*' | wc -l`" \
\r
113 + "`notmuch count --output=threads '*'`"
\r
115 -SEARCH="from:cworth and not from:cworth"
\r
116 test_begin_subtest "count with no matching messages"
\r
117 test_expect_equal \
\r
119 - "`notmuch count --output=messages ${SEARCH}`"
\r
120 + "`notmuch count --output=messages from:cworth and not from:cworth`"
\r
122 test_begin_subtest "count with no matching threads"
\r
123 test_expect_equal \
\r
125 - "`notmuch count --output=threads ${SEARCH}`"
\r
126 + "`notmuch count --output=threads from:cworth and not from:cworth`"
\r