From b9e2cb74929b398925a6e24d3036ac80e019d982 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 9 Mar 2014 17:19:35 +2000 Subject: [PATCH] [Patch v3 05/15] test: fix test for literal folder: search --- 97/95b0323bbf4b07139af113e24ae39662fb7690 | 121 ++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 97/95b0323bbf4b07139af113e24ae39662fb7690 diff --git a/97/95b0323bbf4b07139af113e24ae39662fb7690 b/97/95b0323bbf4b07139af113e24ae39662fb7690 new file mode 100644 index 000000000..10ed6ec87 --- /dev/null +++ b/97/95b0323bbf4b07139af113e24ae39662fb7690 @@ -0,0 +1,121 @@ +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 986DA431FD5 + for ; Sat, 8 Mar 2014 13:20:47 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 o4B-NmrTp8N0 for ; + Sat, 8 Mar 2014 13:20:40 -0800 (PST) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 851DD431FD0 + for ; Sat, 8 Mar 2014 13:20:20 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1WMOfL-00058K-TR; Sat, 08 Mar 2014 17:20:19 -0400 +Received: (nullmailer pid 28536 invoked by uid 1000); Sat, 08 Mar 2014 + 21:20:03 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v3 05/15] test: fix test for literal folder: search +Date: Sat, 8 Mar 2014 17:19:35 -0400 +Message-Id: <1394313585-28422-6-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.8.5.3 +In-Reply-To: <1394313585-28422-1-git-send-email-david@tethera.net> +References: <1394313585-28422-1-git-send-email-david@tethera.net> +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: Sat, 08 Mar 2014 21:20:47 -0000 + +From: Jani Nikula + +Some of the folder: matching capabilities are lost in the +probabilistic to boolean prefix change. Fix them. +--- + test/T100-search-by-folder.sh | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/test/T100-search-by-folder.sh b/test/T100-search-by-folder.sh +index 5cc2ca8..84ca438 100755 +--- a/test/T100-search-by-folder.sh ++++ b/test/T100-search-by-folder.sh +@@ -3,6 +3,7 @@ test_description='"notmuch search" by folder: (with variations)' + . ./test-lib.sh + + add_message '[dir]=bad' '[subject]="To the bone"' ++add_message '[dir]=.' '[subject]="Top level"' + add_message '[dir]=bad/news' '[subject]="Bears"' + mkdir -p "${MAIL_DIR}/duplicate/bad/news" + cp "$gen_msg_filename" "${MAIL_DIR}/duplicate/bad/news" +@@ -12,29 +13,46 @@ add_message '[dir]=things/favorite' '[subject]="Raindrops, whiskers, kettles"' + add_message '[dir]=things/bad' '[subject]="Bites, stings, sad feelings"' + + test_begin_subtest "Single-world folder: specification (multiple results)" +-output=$(notmuch search folder:bad | notmuch_search_sanitize) ++output=$(notmuch search folder:bad folder:bad/news folder:things/bad | notmuch_search_sanitize) + test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; To the bone (inbox unread) + thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Bears (inbox unread) + thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Bites, stings, sad feelings (inbox unread)" + ++test_begin_subtest "Top level folder" ++output=$(notmuch search folder:'""' | notmuch_search_sanitize) ++test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Top level (inbox unread)" ++ + test_begin_subtest "Two-word path to narrow results to one" + output=$(notmuch search folder:bad/news | notmuch_search_sanitize) + test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Bears (inbox unread)" + ++test_begin_subtest "Folder search with --output=files" ++output=$(notmuch search --output=files folder:bad/news | sed -e "s,$MAIL_DIR,MAIL_DIR,") ++test_expect_equal "$output" "MAIL_DIR/bad/news/msg-003 ++MAIL_DIR/duplicate/bad/news/msg-003" ++ + test_begin_subtest "After removing duplicate instance of matching path" + rm -r "${MAIL_DIR}/bad/news" + notmuch new + output=$(notmuch search folder:bad/news | notmuch_search_sanitize) ++test_expect_equal "$output" "" ++ ++test_begin_subtest "Folder search with --output=files part #2" ++output=$(notmuch search --output=files folder:duplicate/bad/news | sed -e "s,$MAIL_DIR,MAIL_DIR,") ++test_expect_equal "$output" "MAIL_DIR/duplicate/bad/news/msg-003" ++ ++test_begin_subtest "After removing duplicate instance of matching path part #2" ++output=$(notmuch search folder:duplicate/bad/news | notmuch_search_sanitize) + test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Bears (inbox unread)" + + test_begin_subtest "After rename, old path returns nothing" + mv "${MAIL_DIR}/duplicate/bad/news" "${MAIL_DIR}/duplicate/bad/olds" + notmuch new +-output=$(notmuch search folder:bad/news | notmuch_search_sanitize) ++output=$(notmuch search folder:duplicate/bad/news | notmuch_search_sanitize) + test_expect_equal "$output" "" + + test_begin_subtest "After rename, new path returns result" +-output=$(notmuch search folder:bad/olds | notmuch_search_sanitize) ++output=$(notmuch search folder:duplicate/bad/olds | notmuch_search_sanitize) + test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Bears (inbox unread)" + + test_done +-- +1.8.5.3 + -- 2.26.2