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