64/b9bacdb4ec632d618878381ed064dca5b8da0e

   1 Return-Path: <jani@nikula.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 25A49429E37\r
   6         for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:13 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: -0.7\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  13         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id gOs7Bcno7UgA for <notmuch@notmuchmail.org>;\r
  17         Sat, 22 Feb 2014 14:26:09 -0800 (PST)\r
  18 Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com\r
  19  [74.125.83.41])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  20  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  21  6BE6E431FBF    for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:00 -0800\r
  22  (PST)\r
  23 Received: by mail-ee0-f41.google.com with SMTP id b15so171101eek.0\r
  24         for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:25:59 -0800 (PST)\r
  25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  26         d=1e100.net; s=20130820;\r
  27         h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
  28         :references:in-reply-to:references;\r
  29         bh=FfTMgmIXjeUEZG9ebSHcX0rehDDBc/sQNdlb61wsWCc=;\r
  30         b=RsG0xDZa+RGAeq+iAX3ClbmoR0grL2G7CnAZvojvvG3g+Pz+LULuCSoTKaWrLWj3bB\r
  31         ZpNM343Sek/UxZ8s+nlFLwiPE4z4R3WAuLFqFyxOcMBH2447uRsgJ1LmpqGv5TI4ghB8\r
  32         RY8CMj+0bilXF5y0EJZpG2ttMs55HfU3WPRm3oKTHwHfLzzU/ZES21gFTmUV9fhjLkKT\r
  33         Gt4MhF7UnZv4NVUJ7me0ShtD7Qa1KIvqiszPUocFKcV6Rw0SQtdGLLLvp7iE4/Ntax5J\r
  34         fdMvW7caRVb/4q/iOorudmaTdaFp57NRqpxYmWyMhDK30DKGEzf3a+UpUgXCURPfI+mU\r
  35         5CQw==\r
  36 X-Gm-Message-State:\r
  37  ALoCoQkJIvuj9doVfgeX6tD5DYYjMI3kveS6Ie7B/S9jFOjH+sT30XyFLedXb5nGn+1TqZCBLape\r
  38 X-Received: by 10.14.176.66 with SMTP id a42mr16115353eem.101.1393107959165;\r
  39         Sat, 22 Feb 2014 14:25:59 -0800 (PST)\r
  40 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  41         [88.195.111.91])\r
  42         by mx.google.com with ESMTPSA id g1sm43759857eet.6.2014.02.22.14.25.57\r
  43         for <multiple recipients>\r
  44         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  45         Sat, 22 Feb 2014 14:25:58 -0800 (PST)\r
  46 From: Jani Nikula <jani@nikula.org>\r
  47 To: notmuch@notmuchmail.org\r
  48 Subject: [PATCH v2 05/13] test: fix test for literal folder: search\r
  49 Date: Sun, 23 Feb 2014 00:25:36 +0200\r
  50 Message-Id:\r
  51  <7f0d707ba67d9de5940e05c110e9a78f669e9b06.1393105055.git.jani@nikula.org>\r
  52 X-Mailer: git-send-email 1.8.5.3\r
  53 In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
  54 References: <cover.1393105055.git.jani@nikula.org>\r
  55 In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
  56 References: <cover.1393105055.git.jani@nikula.org>\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Sat, 22 Feb 2014 22:26:13 -0000\r
  70 \r
  71 Some of the folder: matching capabilities are lost in the\r
  72 probabilistic to boolean prefix change. Fix them.\r
  73 ---\r
  74  test/T100-search-by-folder.sh | 24 +++++++++++++++++++++---\r
  75  1 file changed, 21 insertions(+), 3 deletions(-)\r
  76 \r
  77 diff --git a/test/T100-search-by-folder.sh b/test/T100-search-by-folder.sh\r
  78 index 5cc2ca8d388a..84ca43820031 100755\r
  79 --- a/test/T100-search-by-folder.sh\r
  80 +++ b/test/T100-search-by-folder.sh\r
  81 @@ -3,6 +3,7 @@ test_description='"notmuch search" by folder: (with variations)'\r
  82  . ./test-lib.sh\r
  83  \r
  84  add_message '[dir]=bad' '[subject]="To the bone"'\r
  85 +add_message '[dir]=.' '[subject]="Top level"'\r
  86  add_message '[dir]=bad/news' '[subject]="Bears"'\r
  87  mkdir -p "${MAIL_DIR}/duplicate/bad/news"\r
  88  cp "$gen_msg_filename" "${MAIL_DIR}/duplicate/bad/news"\r
  89 @@ -12,29 +13,46 @@ add_message '[dir]=things/favorite' '[subject]="Raindrops, whiskers, kettles"'\r
  90  add_message '[dir]=things/bad' '[subject]="Bites, stings, sad feelings"'\r
  91  \r
  92  test_begin_subtest "Single-world folder: specification (multiple results)"\r
  93 -output=$(notmuch search folder:bad | notmuch_search_sanitize)\r
  94 +output=$(notmuch search folder:bad folder:bad/news folder:things/bad | notmuch_search_sanitize)\r
  95  test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; To the bone (inbox unread)\r
  96  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Bears (inbox unread)\r
  97  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Bites, stings, sad feelings (inbox unread)"\r
  98  \r
  99 +test_begin_subtest "Top level folder"\r
 100 +output=$(notmuch search folder:'""' | notmuch_search_sanitize)\r
 101 +test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Top level (inbox unread)"\r
 102 +\r
 103  test_begin_subtest "Two-word path to narrow results to one"\r
 104  output=$(notmuch search folder:bad/news | notmuch_search_sanitize)\r
 105  test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Bears (inbox unread)"\r
 106  \r
 107 +test_begin_subtest "Folder search with --output=files"\r
 108 +output=$(notmuch search --output=files folder:bad/news | sed -e "s,$MAIL_DIR,MAIL_DIR,")\r
 109 +test_expect_equal "$output" "MAIL_DIR/bad/news/msg-003\r
 110 +MAIL_DIR/duplicate/bad/news/msg-003"\r
 111 +\r
 112  test_begin_subtest "After removing duplicate instance of matching path"\r
 113  rm -r "${MAIL_DIR}/bad/news"\r
 114  notmuch new\r
 115  output=$(notmuch search folder:bad/news | notmuch_search_sanitize)\r
 116 +test_expect_equal "$output" ""\r
 117 +\r
 118 +test_begin_subtest "Folder search with --output=files part #2"\r
 119 +output=$(notmuch search --output=files folder:duplicate/bad/news | sed -e "s,$MAIL_DIR,MAIL_DIR,")\r
 120 +test_expect_equal "$output" "MAIL_DIR/duplicate/bad/news/msg-003"\r
 121 +\r
 122 +test_begin_subtest "After removing duplicate instance of matching path part #2"\r
 123 +output=$(notmuch search folder:duplicate/bad/news | notmuch_search_sanitize)\r
 124  test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Bears (inbox unread)"\r
 125  \r
 126  test_begin_subtest "After rename, old path returns nothing"\r
 127  mv "${MAIL_DIR}/duplicate/bad/news" "${MAIL_DIR}/duplicate/bad/olds"\r
 128  notmuch new\r
 129 -output=$(notmuch search folder:bad/news | notmuch_search_sanitize)\r
 130 +output=$(notmuch search folder:duplicate/bad/news | notmuch_search_sanitize)\r
 131  test_expect_equal "$output" ""\r
 132  \r
 133  test_begin_subtest "After rename, new path returns result"\r
 134 -output=$(notmuch search folder:bad/olds | notmuch_search_sanitize)\r
 135 +output=$(notmuch search folder:duplicate/bad/olds | notmuch_search_sanitize)\r
 136  test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Bears (inbox unread)"\r
 137  \r
 138  test_done\r
 139 -- \r
 140 1.8.5.3\r
 141 \r