From d8982feeaaacffc0380c4e90afda0edceb1e6cd1 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Fri, 6 Apr 2012 13:49:09 +0100 Subject: [PATCH] [PATCH v3 4/6] test: add some exclude tests --- df/ff2e1e09a3e9578680e6373424cf2b3d08098a | 375 ++++++++++++++++++++++ 1 file changed, 375 insertions(+) create mode 100644 df/ff2e1e09a3e9578680e6373424cf2b3d08098a diff --git a/df/ff2e1e09a3e9578680e6373424cf2b3d08098a b/df/ff2e1e09a3e9578680e6373424cf2b3d08098a new file mode 100644 index 000000000..c564a1dca --- /dev/null +++ b/df/ff2e1e09a3e9578680e6373424cf2b3d08098a @@ -0,0 +1,375 @@ +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 380A8431FDC + for ; Fri, 6 Apr 2012 05:49:29 -0700 (PDT) +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 CxtwZLQbtwGc for ; + Fri, 6 Apr 2012 05:49:24 -0700 (PDT) +Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com + [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 99746431FD5 + for ; Fri, 6 Apr 2012 05:49:22 -0700 (PDT) +Received: by wibhm17 with SMTP id hm17so581198wib.2 + for ; Fri, 06 Apr 2012 05:49:21 -0700 (PDT) +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 + :mime-version:content-type:content-transfer-encoding; + bh=9XVN1MyBdGxU3EoEkA++7NL8M1tjXj1J2YH+zobYI6U=; + b=rwOumgodl2ZmwKWlRBjOu5cejPUyuDqzYv3DnVNNJjzUggkJNp0rZ7Sc8EWhRVM896 + UJbug286KLyxrBeYFhOhgJwKdlk02q51cV77P0G5CDsd+Wc9u0+83f82EtJxI6/clHmW + B5Ju9vFVF2mb2EXIxsHLNVJFTqt1LmJQjgGxDwXC2iF/wNmLBuITiEt3vkJB2rw0P3V1 + SmsN5u4V4ins0ITr+rRPKhyTPC1qPPu4s13Y1mR3qs92pkZhixLiLib8bQXT53rzTXtV + AKRZr6SH/F3umsoBkiixvPtcS53fydXfToDjJiuaSVyDObMtloiSm2W4db9zeeyTInrM + 53GQ== +Received: by 10.180.76.240 with SMTP id n16mr10355606wiw.10.1333716561307; + Fri, 06 Apr 2012 05:49:21 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + u9sm6176570wix.0.2012.04.06.05.49.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, + 06 Apr 2012 05:49:20 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v3 4/6] test: add some exclude tests +Date: Fri, 6 Apr 2012 13:49:09 +0100 +Message-Id: <1333716551-29153-5-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1333716551-29153-1-git-send-email-markwalters1009@gmail.com> +References: <1333716551-29153-1-git-send-email-markwalters1009@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +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: Fri, 06 Apr 2012 12:49:29 -0000 + +Systematically test the exclude options for search. Also move the +search existing exclude tests into the new test. There is some overlap +between the two sets of tests but many of the existing ones are there +because they triggered bugs in the past so I have kept them to ensure +coverage. +--- + test/notmuch-test | 1 + + test/search | 48 ----------- + test/search-excludes | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 220 insertions(+), 48 deletions(-) + create mode 100755 test/search-excludes + +diff --git a/test/notmuch-test b/test/notmuch-test +index f03b594..4dcd8c6 100755 +--- a/test/notmuch-test ++++ b/test/notmuch-test +@@ -27,6 +27,7 @@ TESTS=" + search-position-overlap-bug + search-insufficient-from-quoting + search-limiting ++ search-excludes + tagging + json + multipart +diff --git a/test/search b/test/search +index 17af6a2..a7a0b18 100755 +--- a/test/search ++++ b/test/search +@@ -129,52 +129,4 @@ add_message '[subject]="utf8-message-body-subject"' '[date]="Sat, 01 Jan 2000 12 + output=$(notmuch search "bödý" | notmuch_search_sanitize) + test_expect_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; utf8-message-body-subject (inbox unread)" + +-test_begin_subtest "Exclude \"deleted\" messages from search" +-notmuch config set search.exclude_tags deleted +-generate_message '[subject]="Not deleted"' +-not_deleted_id=$gen_msg_id +-generate_message '[subject]="Deleted"' +-notmuch new > /dev/null +-notmuch tag +deleted id:$gen_msg_id +-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) +-thread:XXX 2001-01-05 [0/1] Notmuch Test Suite; Deleted (deleted inbox unread)" +- +-test_begin_subtest "Exclude \"deleted\" messages from message search" +-output=$(notmuch search --output=messages subject:deleted | notmuch_search_sanitize) +-test_expect_equal "$output" "id:$not_deleted_id" +- +-test_begin_subtest "Exclude \"deleted\" messages from message search (no-exclude)" +-output=$(notmuch search --no-exclude --output=messages subject:deleted | notmuch_search_sanitize) +-test_expect_equal "$output" "id:$not_deleted_id +-id:$deleted_id" +- +-test_begin_subtest "Exclude \"deleted\" messages from message search (non-existent exclude-tag)" +-notmuch config set search.exclude_tags deleted non_existent_tag +-output=$(notmuch search --output=messages subject:deleted | notmuch_search_sanitize) +-test_expect_equal "$output" "id:$not_deleted_id" +-notmuch config set search.exclude_tags deleted +- +-test_begin_subtest "Exclude \"deleted\" messages from search, overridden" +-output=$(notmuch search subject:deleted and tag:deleted | notmuch_search_sanitize) +-test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Deleted (deleted inbox unread)" +- +-test_begin_subtest "Exclude \"deleted\" messages from threads" +-add_message '[subject]="Not deleted reply"' '[in-reply-to]="<$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) +-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) +-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_done +diff --git a/test/search-excludes b/test/search-excludes +new file mode 100755 +index 0000000..a4cef26 +--- /dev/null ++++ b/test/search-excludes +@@ -0,0 +1,219 @@ ++#!/usr/bin/env bash ++test_description='"notmuch search" with excludes in several variations' ++. ./test-lib.sh ++ ++# Generates a thread consisting of a top level message and 'length' ++# replies. The subject of the top message 'subject: top message" ++# and the subject of the nth reply in the thread is "subject: reply n" ++generate_thread () ++{ ++ local subject="$1" ++ local length="$2" ++ generate_message '[subject]="'"${subject}: top message"'"' ++ parent_id=$gen_msg_id ++ gen_thread_msg_id[0]=$gen_msg_id ++ for i in `seq 1 $length` ++ do ++ generate_message '[subject]="'"${subject}: reply $i"'"' \ ++ "[in-reply-to]=\<$parent_id\>" ++ gen_thread_msg_id[$i]=$gen_msg_id ++ parent_id=$gen_msg_id ++ done ++ notmuch new > /dev/null ++ # We cannot retrieve the thread_id until after we have run notmuch new. ++ gen_thread_id=`notmuch search --output=threads id:${gen_thread_msg_id[0]}` ++} ++ ++# These are the original search exclude tests. ++ ++test_begin_subtest "Exclude \"deleted\" messages from search" ++notmuch config set search.exclude_tags deleted ++generate_message '[subject]="Not deleted"' ++not_deleted_id=$gen_msg_id ++generate_message '[subject]="Deleted"' ++notmuch new > /dev/null ++notmuch tag +deleted id:$gen_msg_id ++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_begin_subtest "Exclude \"deleted\" messages from message search" ++output=$(notmuch search --output=messages subject:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "id:$not_deleted_id" ++ ++test_begin_subtest "Exclude \"deleted\" messages from message search --exclude=false" ++output=$(notmuch search --exclude=false --output=messages subject:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "id:$not_deleted_id ++id:$deleted_id" ++ ++test_begin_subtest "Exclude \"deleted\" messages from message search (non-existent exclude-tag)" ++notmuch config set search.exclude_tags deleted non_existent_tag ++output=$(notmuch search --output=messages subject:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "id:$not_deleted_id" ++notmuch config set search.exclude_tags deleted ++ ++test_begin_subtest "Exclude \"deleted\" messages from search, overridden" ++output=$(notmuch search subject:deleted and tag:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Deleted (deleted inbox unread)" ++ ++test_begin_subtest "Exclude \"deleted\" messages from threads" ++add_message '[subject]="Not deleted reply"' '[in-reply-to]="<$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) ++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 --exclude=flag specified" ++output=$(notmuch search --exclude=flag 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 from search if not configured" ++notmuch config set search.exclude_tags ++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 [2/2] Notmuch Test Suite; Deleted (deleted inbox unread)" ++ ++ ++ ++ ++# We construct some threads for the tests. We use the tag "test" to ++# indicate which messages we will search for. ++ ++# A thread of deleted messages; test matches one of them. ++generate_thread "All messages excluded: single match" 5 ++notmuch tag +deleted $gen_thread_id ++notmuch tag +test id:${gen_thread_msg_id[2]} ++ ++# A thread of deleted messages; test matches two of them. ++generate_thread "All messages excluded: double match" 5 ++notmuch tag +deleted $gen_thread_id ++notmuch tag +test id:${gen_thread_msg_id[2]} ++notmuch tag +test id:${gen_thread_msg_id[4]} ++ ++# A thread some messages deleted; test only matches a deleted message. ++generate_thread "Some messages excluded: single excluded match" 5 ++notmuch tag +deleted +test id:${gen_thread_msg_id[3]} ++ ++# A thread some messages deleted; test only matches a non-deleted message. ++generate_thread "Some messages excluded: single non-excluded match" 5 ++notmuch tag +deleted id:${gen_thread_msg_id[2]} ++notmuch tag +test id:${gen_thread_msg_id[4]} ++ ++# A thread no messages deleted; test matches a message. ++generate_thread "No messages excluded: single match" 5 ++notmuch tag +test id:${gen_thread_msg_id[3]} ++ ++# Temporarily remove excludes to get list of matching messages ++notmuch config set search.exclude_tags ++matching_message_ids=( `notmuch search --output=messages tag:test` ) ++notmuch config set search.exclude_tags deleted ++ ++test_begin_subtest "Default exclusion (thread summary)" ++output=$(notmuch search tag:test | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single non-excluded match: reply 4 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; No messages excluded: single match: reply 3 (inbox test unread)" ++ ++test_begin_subtest "Default exclusion (messages)" ++output=$(notmuch search --output=messages tag:test | notmuch_search_sanitize) ++test_expect_equal "$output" "${matching_message_ids[4]} ++${matching_message_ids[5]}" ++ ++test_begin_subtest "exclude=true (thread summary)" ++output=$(notmuch search --exclude=true tag:test | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single non-excluded match: reply 4 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; No messages excluded: single match: reply 3 (inbox test unread)" ++ ++test_begin_subtest "exclude=true (messages)" ++output=$(notmuch search --exclude=true --output=messages tag:test | notmuch_search_sanitize) ++test_expect_equal "$output" "${matching_message_ids[4]} ++${matching_message_ids[5]}" ++ ++test_begin_subtest "exclude=false (thread summary)" ++output=$(notmuch search --exclude=false tag:test | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; All messages excluded: single match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [2/6] Notmuch Test Suite; All messages excluded: double match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single excluded match: reply 3 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single non-excluded match: reply 4 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; No messages excluded: single match: reply 3 (inbox test unread)" ++ ++test_begin_subtest "exclude=false (messages)" ++output=$(notmuch search --exclude=false --output=messages tag:test | notmuch_search_sanitize) ++test_expect_equal "$output" "${matching_message_ids[0]} ++${matching_message_ids[1]} ++${matching_message_ids[2]} ++${matching_message_ids[3]} ++${matching_message_ids[4]} ++${matching_message_ids[5]}" ++ ++test_begin_subtest "exclude=flag (thread summary)" ++output=$(notmuch search --exclude=flag tag:test | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [0/6] Notmuch Test Suite; All messages excluded: single match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [0/6] Notmuch Test Suite; All messages excluded: double match: reply 4 (deleted inbox test unread) ++thread:XXX 2001-01-05 [0/6] Notmuch Test Suite; Some messages excluded: single excluded match: reply 3 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single non-excluded match: reply 4 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; No messages excluded: single match: reply 3 (inbox test unread)" ++ ++test_begin_subtest "exclude=flag (messages)" ++output=$(notmuch search --exclude=flag --output=messages tag:test | notmuch_search_sanitize) ++test_expect_equal "$output" "${matching_message_ids[0]} ++${matching_message_ids[1]} ++${matching_message_ids[2]} ++${matching_message_ids[3]} ++${matching_message_ids[4]} ++${matching_message_ids[5]}" ++ ++test_begin_subtest "Default exclusion: tag in query (thread summary)" ++output=$(notmuch search tag:test and tag:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; All messages excluded: single match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [2/6] Notmuch Test Suite; All messages excluded: double match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single excluded match: reply 3 (deleted inbox test unread)" ++ ++test_begin_subtest "Default exclusion: tag in query (messages)" ++output=$(notmuch search --output=messages tag:test and tag:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "${matching_message_ids[0]} ++${matching_message_ids[1]} ++${matching_message_ids[2]} ++${matching_message_ids[3]}" ++ ++test_begin_subtest "exclude=true: tag in query (thread summary)" ++output=$(notmuch search --exclude=true tag:test and tag:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; All messages excluded: single match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [2/6] Notmuch Test Suite; All messages excluded: double match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single excluded match: reply 3 (deleted inbox test unread)" ++ ++test_begin_subtest "exclude=true: tag in query (messages)" ++output=$(notmuch search --exclude=true --output=messages tag:test and tag:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "${matching_message_ids[0]} ++${matching_message_ids[1]} ++${matching_message_ids[2]} ++${matching_message_ids[3]}" ++ ++test_begin_subtest "exclude=false: tag in query (thread summary)" ++output=$(notmuch search --exclude=false tag:test and tag:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; All messages excluded: single match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [2/6] Notmuch Test Suite; All messages excluded: double match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single excluded match: reply 3 (deleted inbox test unread)" ++ ++test_begin_subtest "exclude=false: tag in query (messages)" ++output=$(notmuch search --exclude=false --output=messages tag:test and tag:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "${matching_message_ids[0]} ++${matching_message_ids[1]} ++${matching_message_ids[2]} ++${matching_message_ids[3]}" ++ ++test_begin_subtest "exclude=flag: tag in query (thread summary)" ++output=$(notmuch search --exclude=flag tag:test and tag:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; All messages excluded: single match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [2/6] Notmuch Test Suite; All messages excluded: double match: reply 2 (deleted inbox test unread) ++thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single excluded match: reply 3 (deleted inbox test unread)" ++ ++test_begin_subtest "exclude=flag: tag in query (messages)" ++output=$(notmuch search --exclude=flag --output=messages tag:test and tag:deleted | notmuch_search_sanitize) ++test_expect_equal "$output" "${matching_message_ids[0]} ++${matching_message_ids[1]} ++${matching_message_ids[2]} ++${matching_message_ids[3]}" ++ ++ ++ ++test_done +-- +1.7.9.1 + -- 2.26.2