[Patch v7 07/13] test: update search test to reflect exclude flag

diff --git a/b9/b38f635bc80a01db5de8b2d81cb90f368f1cbf b/b9/b38f635bc80a01db5de8b2d81cb90f368f1cbf
new file mode 100644 (file)
index 0000000..619ace1
--- /dev/null
+++ b/b9/b38f635bc80a01db5de8b2d81cb90f368f1cbf
@@ -0,0 +1,95 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id F25CD429E29\r
+       for <notmuch@notmuchmail.org>; Thu,  1 Mar 2012 14:29:47 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id AC-utmMJepaO for <notmuch@notmuchmail.org>;\r
+       Thu,  1 Mar 2012 14:29:47 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 3F755429E37   for <notmuch@notmuchmail.org>; Thu,  1 Mar 2012 14:29:34 -0800\r
+ (PST)\r
+Received: by mail-ww0-f45.google.com with SMTP id dt12so108365wgb.2\r
+       for <notmuch@notmuchmail.org>; Thu, 01 Mar 2012 14:29:34 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+       10.180.99.100 as permitted sender) client-ip=10.180.99.100; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+       markwalters1009@gmail.com designates 10.180.99.100 as permitted\r
+       sender) smtp.mail=markwalters1009@gmail.com;\r
+       dkim=pass header.i=markwalters1009@gmail.com\r
+Received: from mr.google.com ([10.180.99.100])\r
+       by 10.180.99.100 with SMTP id ep4mr14966029wib.7.1330640974083\r
+       (num_hops = 1); Thu, 01 Mar 2012 14:29:34 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=vpoOeVGyYmTy5uCIjoxuoUv0T013T2zX8Mdr/8XUWm8=;\r
+       b=WBDgPPjG6o3ZL5CfhyC9Y/SXRPhSmAcxuXr03BRYaOmnqAvQRCgHzhWOz76Zlcpdto\r
+       6Z0d7fm+qZ9FEkGcD3+VOFY4c74NkrDWaxK5HpZohNx7EH/HnH3FF0N66Ym4Ulmf+C9T\r
+       pVzLX570cWzav97XLzuDQxb1EruNYeiMsiGv7FmO+NE2i/GjkxH6Bs6sPr5B0/eEzGr5\r
+       XY5f71Wc1Xk0JjFUGK3S18423A8lRJ30wbG3yJhFmrU9x9j4dsGZGpoFPFoOvLPtlzKV\r
+       Pg1jnIkxvK+vQc/OdW9poIQX7RIdirGul41ULftrpTS6T325ZxtDT8GqYmMXXmEhifRT\r
+       kOaw==\r
+Received: by 10.180.99.100 with SMTP id ep4mr12005881wib.7.1330640974017;\r
+       Thu, 01 Mar 2012 14:29:34 -0800 (PST)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ fw5sm44680083wib.0.2012.03.01.14.29.32        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Thu, 01 Mar 2012 14:29:33 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v7 07/13] test: update search test to reflect exclude flag\r
+Date: Thu,  1 Mar 2012 22:30:39 +0000\r
+Message-Id: <1330641045-27416-8-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330641045-27416-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330641045-27416-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 01 Mar 2012 22:29:48 -0000\r
+\r
+notmuch-search.c now returns all matching threads even if it the\r
+match is a search.tag_excluded message (but with a mark indicating\r
+this). Update the test to reflect this.\r
+---\r
+ test/search |    3 ++-\r
+ 1 files changed, 2 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/search b/test/search\r
+index 3da5d17..081f60c 100755\r
+--- a/test/search\r
++++ b/test/search\r
+@@ -136,7 +136,8 @@ generate_message '[subject]="Deleted"'\r
+ notmuch new > /dev/null\r
+ notmuch tag +deleted id:$gen_msg_id\r
+ output=$(notmuch search subject:deleted | notmuch_search_sanitize)\r
+-test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread)"\r
++test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread)\r
++thread:XXX   2001-01-05 [0/1] Notmuch Test Suite; Deleted (deleted inbox unread)"\r
+ \r
+ test_begin_subtest "Exclude \"deleted\" messages from search, overridden"\r
+ output=$(notmuch search subject:deleted and tag:deleted | notmuch_search_sanitize)\r
+-- \r
+1.7.2.3\r
+\r