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

diff --git a/4c/a075e773b1ce27610ce4491477995dfd81c1ac b/4c/a075e773b1ce27610ce4491477995dfd81c1ac
new file mode 100644 (file)
index 0000000..46dede9
--- /dev/null
+++ b/4c/a075e773b1ce27610ce4491477995dfd81c1ac
@@ -0,0 +1,93 @@
+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 423AC431FBD\r
+       for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 22:34:20 -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 35oGMHKFzTqk for <notmuch@notmuchmail.org>;\r
+       Sat, 25 Feb 2012 22:34:19 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A56C6431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 22:34:19 -0800 (PST)\r
+Received: by wibhi8 with SMTP id hi8so2583573wib.26\r
+       for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 22:34:18 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+       10.180.86.9 as permitted sender) client-ip=10.180.86.9; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+       markwalters1009@gmail.com designates 10.180.86.9 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.86.9])\r
+       by 10.180.86.9 with SMTP id l9mr17947746wiz.15.1330238058463 (num_hops\r
+       = 1); Sat, 25 Feb 2012 22:34:18 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=vpoOeVGyYmTy5uCIjoxuoUv0T013T2zX8Mdr/8XUWm8=;\r
+       b=EYxqARL5FZZl3VXbJhrcmj8n+J/xkZLpEEfGJ0w7/T8FDhlHTCuKTUkjyjPFnc0y3q\r
+       qbesQBl0LLMZJ60o5mvVvGRXYvhC5dPXGJgtFKKpvyiQ3EH7qGDzte8+SJol8k1oOiK7\r
+       ccnd/LrXstFKt6WvTmbt0cTH2CWs2pJDfy8co=\r
+Received: by 10.180.86.9 with SMTP id l9mr9302191wiz.15.1330157141939;\r
+       Sat, 25 Feb 2012 00:05:41 -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
+ m8sm20573789wia.11.2012.02.25.00.05.40        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 25 Feb 2012 00:05:41 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+       Austin Clements <amdragon@MIT.EDU>\r
+Subject: [Patch v6 07/13] test: update search test to reflect exclude flag\r
+Date: Sat, 25 Feb 2012 08:06:38 +0000\r
+Message-Id: <1330157204-26094-8-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330157204-26094-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330157204-26094-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: Sun, 26 Feb 2012 06:34:20 -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