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