From a22cd1a85c4b774e2668ce765f48ed15fbbdc774 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 2 Feb 2012 17:43:31 +0000 Subject: [PATCH] [PATCH v4 03/11] test: add tests for new cli --no-exclude option --- d9/bf3cfe48a318348d731ff8f5dc852bf23c4a26 | 117 ++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 d9/bf3cfe48a318348d731ff8f5dc852bf23c4a26 diff --git a/d9/bf3cfe48a318348d731ff8f5dc852bf23c4a26 b/d9/bf3cfe48a318348d731ff8f5dc852bf23c4a26 new file mode 100644 index 000000000..67f2fdd47 --- /dev/null +++ b/d9/bf3cfe48a318348d731ff8f5dc852bf23c4a26 @@ -0,0 +1,117 @@ +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 F25D5431FD7 + for ; Thu, 2 Feb 2012 09:43:03 -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 RN0zq4VaunHL for ; + Thu, 2 Feb 2012 09:43:02 -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 EC3DE431FBD + for ; Thu, 2 Feb 2012 09:42:59 -0800 (PST) +Received: by wibhi8 with SMTP id hi8so2134840wib.26 + for ; Thu, 02 Feb 2012 09:42:58 -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=fN7XN3hi51DAGN4YfZOUofu3diawcjE5kNxzwiGd8sI=; + b=LF87vPHlb9wPr/yCEHlxtfy6FDhijbN4YIVNE7ry1witvs9SubPT9oj+uaVotSyLH8 + sK75hbpTOJ6kjMi/2Ui6uJv4Wp1tfCXdMbBDhq4M5JI5phKzlv/qCP9WJhJL03Idj8mL + bmDkzgztJRXmh3OTfItBiWqV8TuGvImZKscLk= +Received: by 10.180.86.9 with SMTP id l9mr6177288wiz.15.1328204578775; + Thu, 02 Feb 2012 09:42:58 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + t15sm1132108wiv.6.2012.02.02.09.42.56 (version=TLSv1/SSLv3 cipher=OTHER); + Thu, 02 Feb 2012 09:42:57 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org, + amdragon@MIT.EDU +Subject: [PATCH v4 03/11] test: add tests for new cli --no-exclude option +Date: Thu, 2 Feb 2012 17:43:31 +0000 +Message-Id: <1328204619-25046-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <874nv9rv79.fsf@qmul.ac.uk> +References: <874nv9rv79.fsf@qmul.ac.uk> +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, 02 Feb 2012 17:43:04 -0000 + +The tests test the new --no-exclude option to search and count. +There were no existing tests for the exclude behaviour for count so +added these too. +--- + test/count | 21 +++++++++++++++++++++ + test/search | 5 +++++ + 2 files changed, 26 insertions(+), 0 deletions(-) + +diff --git a/test/count b/test/count +index 300b171..976fff1 100755 +--- a/test/count ++++ b/test/count +@@ -37,4 +37,25 @@ test_expect_equal \ + "0" \ + "`notmuch count --output=threads ${SEARCH}`" + ++test_begin_subtest "count excluding \"deleted\" messages" ++notmuch config set search.exclude_tags = deleted ++generate_message '[subject]="Not deleted"' ++generate_message '[subject]="Another not deleted"' ++generate_message '[subject]="Deleted"' ++notmuch new > /dev/null ++notmuch tag +deleted id:$gen_msg_id ++test_expect_equal \ ++ "2" \ ++ "`notmuch count subject:deleted`" ++ ++test_begin_subtest "count \"deleted\" messages, exclude overridden" ++test_expect_equal \ ++ "1" \ ++ "`notmuch count subject:deleted and tag:deleted`" ++ ++test_begin_subtest "count \"deleted\" messages, with --no-exclude" ++test_expect_equal \ ++ "3" \ ++ "`notmuch count --no-exclude subject:deleted`" ++ + test_done +diff --git a/test/search b/test/search +index 414be35..3da5d17 100755 +--- a/test/search ++++ b/test/search +@@ -148,6 +148,11 @@ 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) + thread:XXX 2001-01-05 [1/2] Notmuch Test Suite; Not deleted reply (deleted inbox unread)" + ++test_begin_subtest "Don't exclude \"deleted\" messages when --no-exclude specified" ++output=$(notmuch search --no-exclude subject:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread) ++thread:XXX 2001-01-05 [2/2] Notmuch Test Suite; Deleted (deleted inbox unread)" ++ + test_begin_subtest "Don't exclude \"deleted\" messages from search if not configured" + notmuch config set search.exclude_tags + output=$(notmuch search subject:deleted | notmuch_search_sanitize) +-- +1.7.2.3 + -- 2.26.2