e0/22ab0a3f0ac36554cb247d213c9e44f2c4884c

   1 Return-Path: <markwalters1009@gmail.com>\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 DA9C6431FBD\r
   6         for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 22:14:32 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0.201\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
  14         RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id tjEoas0S618K for <notmuch@notmuchmail.org>;\r
  18         Sat, 25 Feb 2012 22:14:32 -0800 (PST)\r
  19 Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
  20  [74.125.82.45])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  21  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  22  3A8CF431FAE    for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 22:14:32 -0800\r
  23  (PST)\r
  24 Received: by wgbdt12 with SMTP id dt12so2830429wgb.2\r
  25         for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 22:14:31 -0800 (PST)\r
  26 Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
  27         10.180.90.225 as permitted sender) client-ip=10.180.90.225; \r
  28 Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
  29         markwalters1009@gmail.com designates 10.180.90.225 as permitted\r
  30         sender) smtp.mail=markwalters1009@gmail.com;\r
  31         dkim=pass header.i=markwalters1009@gmail.com\r
  32 Received: from mr.google.com ([10.180.90.225])\r
  33         by 10.180.90.225 with SMTP id bz1mr8529762wib.5.1330236871175 (num_hops\r
  34         = 1); Sat, 25 Feb 2012 22:14:31 -0800 (PST)\r
  35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  36         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  37         bh=fN7XN3hi51DAGN4YfZOUofu3diawcjE5kNxzwiGd8sI=;\r
  38         b=Nnaz8AEtAv8BbKB73bhclbku/9K2hTVQH+YMXGw0mPCRxv7L9Py9mWqtDuGOaMdqls\r
  39         KSZONmGOMkmV3+1xFjeryX3oHufkPDsGYq8W17SIYeRf9Ni40Bmlg/dkR7HMXP+Ma4vt\r
  40         DScI+Bt0SxkDNBAT8kFNEEAf+2jJ6W9bDGkRg=\r
  41 Received: by 10.180.90.225 with SMTP id bz1mr1783752wib.5.1330157131886;\r
  42         Sat, 25 Feb 2012 00:05:31 -0800 (PST)\r
  43 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
  44  [94.192.233.223])      by mx.google.com with ESMTPS id\r
  45  s4sm13026163wiy.5.2012.02.25.00.05.30  (version=TLSv1/SSLv3 cipher=OTHER);\r
  46         Sat, 25 Feb 2012 00:05:31 -0800 (PST)\r
  47 From: Mark Walters <markwalters1009@gmail.com>\r
  48 To: notmuch@notmuchmail.org,\r
  49         Austin Clements <amdragon@MIT.EDU>\r
  50 Subject: [Patch v6 03/13] test: add tests for new cli --no-exclude option\r
  51 Date: Sat, 25 Feb 2012 08:06:34 +0000\r
  52 Message-Id: <1330157204-26094-4-git-send-email-markwalters1009@gmail.com>\r
  53 X-Mailer: git-send-email 1.7.2.3\r
  54 In-Reply-To: <1330157204-26094-1-git-send-email-markwalters1009@gmail.com>\r
  55 References: <1330157204-26094-1-git-send-email-markwalters1009@gmail.com>\r
  56 X-BeenThere: notmuch@notmuchmail.org\r
  57 X-Mailman-Version: 2.1.13\r
  58 Precedence: list\r
  59 List-Id: "Use and development of the notmuch mail system."\r
  60         <notmuch.notmuchmail.org>\r
  61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  64 List-Post: <mailto:notmuch@notmuchmail.org>\r
  65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  68 X-List-Received-Date: Sun, 26 Feb 2012 06:14:33 -0000\r
  69 \r
  70 The tests test the new --no-exclude option to search and count.\r
  71 There were no existing tests for the exclude behaviour for count so\r
  72 added these too.\r
  73 ---\r
  74  test/count  |   21 +++++++++++++++++++++\r
  75  test/search |    5 +++++\r
  76  2 files changed, 26 insertions(+), 0 deletions(-)\r
  77 \r
  78 diff --git a/test/count b/test/count\r
  79 index 300b171..976fff1 100755\r
  80 --- a/test/count\r
  81 +++ b/test/count\r
  82 @@ -37,4 +37,25 @@ test_expect_equal \\r
  83      "0" \\r
  84      "`notmuch count --output=threads ${SEARCH}`"\r
  85  \r
  86 +test_begin_subtest "count excluding \"deleted\" messages"\r
  87 +notmuch config set search.exclude_tags = deleted\r
  88 +generate_message '[subject]="Not deleted"'\r
  89 +generate_message '[subject]="Another not deleted"'\r
  90 +generate_message '[subject]="Deleted"'\r
  91 +notmuch new > /dev/null\r
  92 +notmuch tag +deleted id:$gen_msg_id\r
  93 +test_expect_equal \\r
  94 +    "2" \\r
  95 +    "`notmuch count subject:deleted`"\r
  96 +\r
  97 +test_begin_subtest "count \"deleted\" messages, exclude overridden"\r
  98 +test_expect_equal \\r
  99 +    "1" \\r
 100 +    "`notmuch count subject:deleted and tag:deleted`"\r
 101 +\r
 102 +test_begin_subtest "count \"deleted\" messages, with --no-exclude"\r
 103 +test_expect_equal \\r
 104 +    "3" \\r
 105 +    "`notmuch count --no-exclude subject:deleted`"\r
 106 +\r
 107  test_done\r
 108 diff --git a/test/search b/test/search\r
 109 index 414be35..3da5d17 100755\r
 110 --- a/test/search\r
 111 +++ b/test/search\r
 112 @@ -148,6 +148,11 @@ output=$(notmuch search subject:deleted | notmuch_search_sanitize)\r
 113  test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread)\r
 114  thread:XXX   2001-01-05 [1/2] Notmuch Test Suite; Not deleted reply (deleted inbox unread)"\r
 115  \r
 116 +test_begin_subtest "Don't exclude \"deleted\" messages when --no-exclude specified"\r
 117 +output=$(notmuch search --no-exclude subject:deleted | notmuch_search_sanitize)\r
 118 +test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread)\r
 119 +thread:XXX   2001-01-05 [2/2] Notmuch Test Suite; Deleted (deleted inbox unread)"\r
 120 +\r
 121  test_begin_subtest "Don't exclude \"deleted\" messages from search if not configured"\r
 122  notmuch config set search.exclude_tags\r
 123  output=$(notmuch search subject:deleted | notmuch_search_sanitize)\r
 124 -- \r
 125 1.7.2.3\r
 126 \r