1 Return-Path: <dme@dme.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 2198D431FD4
\r
6 for <notmuch@notmuchmail.org>; Fri, 24 Oct 2014 10:44:21 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7, UNPARSEABLE_RELAY=0.001]
\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 y4606dVhcyvV for <notmuch@notmuchmail.org>;
\r
17 Fri, 24 Oct 2014 10:44:14 -0700 (PDT)
\r
18 Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com
\r
19 [74.125.82.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
20 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
21 E50A4431FD7 for <notmuch@notmuchmail.org>; Fri, 24 Oct 2014 10:44:10 -0700
\r
23 Received: by mail-wg0-f41.google.com with SMTP id b13so1626537wgh.24
\r
24 for <notmuch@notmuchmail.org>; Fri, 24 Oct 2014 10:44:09 -0700 (PDT)
\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=1e100.net; s=20130820;
\r
27 h=x-gm-message-state:user-agent:from:to:subject:date:message-id
\r
28 :in-reply-to:references:mime-version:content-type
\r
29 :content-transfer-encoding;
\r
30 bh=k2cYpPgF9E1NvNUqi8RMVPtHzU/IfjGBRvahAZ75YHc=;
\r
31 b=bTvwWttWeFE/dUyOvS29jxV133qYVxjzvRxCrWp9wTeVRG+vRxIJrBLJTuBh5Fov4S
\r
32 3WiRwoocr7++d4Yq+Nhp5pquSb1hySSKtC4+xo8z83Gptb/5mApZz2CNT+frIpm7/YtO
\r
33 uSXl5DSkVTLfH+NncRsXwos2sEXuc/kEu95mecerMERZDotXySDeQ4AAny+C/TYpjTN/
\r
34 VAUolFWuKQSk6JKQuUN+qUAiFRdbltdvyL8cMqeP56GlIu9PACwY36yYcBH4Kj5n082L
\r
35 sVi0j4eRPGNmQrVbUYZg9wY175oHmZtlcW3aMaLlhcHvaQsTnaOVOiabpC8owPOd+ZXA
\r
38 ALoCoQljBaaYM8BjGNNLt9IJQO5Onns0MuNV55lPj8HVTQnlIpTnehMtnsTk4Etc0ukk0WOL0X12
\r
39 X-Received: by 10.180.36.38 with SMTP id n6mr5402832wij.27.1414172649503;
\r
40 Fri, 24 Oct 2014 10:44:09 -0700 (PDT)
\r
41 Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net.
\r
43 by mx.google.com with ESMTPSA id dq7sm2726263wid.12.2014.10.24.10.44.08
\r
44 for <notmuch@notmuchmail.org>
\r
45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
46 Fri, 24 Oct 2014 10:44:08 -0700 (PDT)
\r
47 Received: from localhost (30000@localhost [local]);
\r
48 by localhost (OpenSMTPD) with ESMTPA id 531357ab;
\r
49 for <notmuch@notmuchmail.org>; Fri, 24 Oct 2014 17:44:03 +0000 (UTC)
\r
50 User-Agent: OpenSMTPD enqueuer (Demoostik)
\r
51 From: David Edmondson <dme@dme.org>
\r
52 To: notmuch@notmuchmail.org
\r
53 Subject: [PATCH v2 3/3] test: Update tests for 'authors_matched' and
\r
54 authors_non_matched'.
\r
55 Date: Fri, 24 Oct 2014 18:44:03 +0100
\r
56 Message-Id: <1414172643-28270-4-git-send-email-dme@dme.org>
\r
57 X-Mailer: git-send-email 2.1.1
\r
58 In-Reply-To: <1414172643-28270-1-git-send-email-dme@dme.org>
\r
59 References: <1414172643-28270-1-git-send-email-dme@dme.org>
\r
61 Content-Type: text/plain; charset=UTF-8
\r
62 Content-Transfer-Encoding: 8bit
\r
63 X-BeenThere: notmuch@notmuchmail.org
\r
64 X-Mailman-Version: 2.1.13
\r
66 List-Id: "Use and development of the notmuch mail system."
\r
67 <notmuch.notmuchmail.org>
\r
68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
71 List-Post: <mailto:notmuch@notmuchmail.org>
\r
72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
74 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
75 X-List-Received-Date: Fri, 24 Oct 2014 17:44:21 -0000
\r
78 test/T160-json.sh | 9 +++++++++
\r
79 test/T170-sexp.sh | 4 ++--
\r
80 test/T470-missing-headers.sh | 8 ++++++++
\r
81 3 files changed, 19 insertions(+), 2 deletions(-)
\r
83 diff --git a/test/T160-json.sh b/test/T160-json.sh
\r
84 index c1cf649..0a8df18 100755
\r
85 --- a/test/T160-json.sh
\r
86 +++ b/test/T160-json.sh
\r
87 @@ -25,6 +25,10 @@ test_expect_equal_json "$output" "[{\"thread\": \"XXX\",
\r
90 \"authors\": \"Notmuch Test Suite\",
\r
91 + \"authors_matched\": [
\r
92 + \"Notmuch Test Suite\"
\r
94 + \"authors_non_matched\": [],
\r
95 \"subject\": \"json-search-subject\",
\r
96 \"query\": [\"id:$gen_msg_id\", null],
\r
97 \"tags\": [\"inbox\",
\r
98 @@ -59,6 +63,11 @@ test_expect_equal_json "$output" "[{\"thread\": \"XXX\",
\r
101 \"authors\": \"Notmuch Test Suite\",
\r
102 + \"authors\": \"Notmuch Test Suite\",
\r
103 + \"authors_matched\": [
\r
104 + \"Notmuch Test Suite\"
\r
106 + \"authors_non_matched\": [],
\r
107 \"subject\": \"json-search-utf8-body-sübjéct\",
\r
108 \"query\": [\"id:$gen_msg_id\", null],
\r
109 \"tags\": [\"inbox\",
\r
110 diff --git a/test/T170-sexp.sh b/test/T170-sexp.sh
\r
111 index 667e319..f2a08bf 100755
\r
112 --- a/test/T170-sexp.sh
\r
113 +++ b/test/T170-sexp.sh
\r
114 @@ -19,7 +19,7 @@ test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil :f
\r
115 test_begin_subtest "Search message: sexp"
\r
116 add_message "[subject]=\"sexp-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"sexp-search-message\""
\r
117 output=$(notmuch search --format=sexp "sexp-search-message" | notmuch_search_sanitize)
\r
118 -test_expect_equal "$output" "((:thread \"0000000000000002\" :timestamp 946728000 :date_relative \"2000-01-01\" :matched 1 :total 1 :authors \"Notmuch Test Suite\" :subject \"sexp-search-subject\" :query (\"id:$gen_msg_id\" nil) :tags (\"inbox\" \"unread\")))"
\r
119 +test_expect_equal "$output" "((:thread \"0000000000000002\" :timestamp 946728000 :date_relative \"2000-01-01\" :matched 1 :total 1 :authors \"Notmuch Test Suite\" :authors_matched (\"Notmuch Test Suite\") :authors_non_matched () :subject \"sexp-search-subject\" :query (\"id:$gen_msg_id\" nil) :tags (\"inbox\" \"unread\")))"
\r
121 test_begin_subtest "Show message: sexp, utf-8"
\r
122 add_message "[subject]=\"sexp-show-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-show-méssage\""
\r
123 @@ -44,7 +44,7 @@ test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename \"
\r
124 test_begin_subtest "Search message: sexp, utf-8"
\r
125 add_message "[subject]=\"sexp-search-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-search-méssage\""
\r
126 output=$(notmuch search --format=sexp "jsön-search-méssage" | notmuch_search_sanitize)
\r
127 -test_expect_equal "$output" "((:thread \"0000000000000005\" :timestamp 946728000 :date_relative \"2000-01-01\" :matched 1 :total 1 :authors \"Notmuch Test Suite\" :subject \"sexp-search-utf8-body-sübjéct\" :query (\"id:$gen_msg_id\" nil) :tags (\"inbox\" \"unread\")))"
\r
128 +test_expect_equal "$output" "((:thread \"0000000000000005\" :timestamp 946728000 :date_relative \"2000-01-01\" :matched 1 :total 1 :authors \"Notmuch Test Suite\" :authors_matched (\"Notmuch Test Suite\") :authors_non_matched () :subject \"sexp-search-utf8-body-sübjéct\" :query (\"id:$gen_msg_id\" nil) :tags (\"inbox\" \"unread\")))"
\r
132 diff --git a/test/T470-missing-headers.sh b/test/T470-missing-headers.sh
\r
133 index cb38301..250a370 100755
\r
134 --- a/test/T470-missing-headers.sh
\r
135 +++ b/test/T470-missing-headers.sh
\r
136 @@ -34,6 +34,10 @@ test_expect_equal_json "$output" '
\r
140 + "authors_matched": [
\r
143 + "authors_non_matched": [],
\r
144 "date_relative": "2001-01-05",
\r
147 @@ -48,6 +52,10 @@ test_expect_equal_json "$output" '
\r
150 "authors": "Notmuch Test Suite",
\r
151 + "authors_matched": [
\r
152 + "Notmuch Test Suite"
\r
154 + "authors_non_matched": [],
\r
155 "date_relative": "1970-01-01",
\r