56/3007fbe41a214364b9d0f955e417ede164aa14

   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 72005431FC9\r
   6         for <notmuch@notmuchmail.org>; Thu,  9 Jan 2014 23:33:58 -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 NFOOrHPXNs0u for <notmuch@notmuchmail.org>;\r
  17         Thu,  9 Jan 2014 23:31:51 -0800 (PST)\r
  18 Received: from mail-ea0-f178.google.com (mail-ea0-f178.google.com\r
  19         [209.85.215.178]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 9B558431FBC\r
  22         for <notmuch@notmuchmail.org>; Thu,  9 Jan 2014 23:31:51 -0800 (PST)\r
  23 Received: by mail-ea0-f178.google.com with SMTP id d10so1870105eaj.23\r
  24         for <notmuch@notmuchmail.org>; Thu, 09 Jan 2014 23:31:50 -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=jyEKxiTt1wmKBQCMPVTCHlmExj4ZqUY/HAz3x3K+2Uo=;\r
  30         b=i05n/dNYsrge8KCmygA6bgZSsXh197sq35BXQ4P6sOkN3ZR7kurNSDPU5A+RdHsHm/\r
  31         7fDj5TqXitXoyNVdGvvU5TXvGKG2umfGC7QGkNZkh2h68jEndf96Fu+2xcrqexS4YRwO\r
  32         vhEENIxiOKW6592uxNH0ZEoJGWkffKHacE952Xn4jVHaewd4ag2/sQrf2ohiX+x3TuX+\r
  33         FUVRZ8jlE2zV0mX8RmZaxootR3NDk5SWWHbtjYttoINxMGfkh9/5RsitI3wZGi/4LdLC\r
  34         DJ7nvm1Q5FhY10H8AnmE6QrSxys/jjybUxv+7KDnheC+t/0mnKu24RYj39KsXHG37aob\r
  35         DmrQ==\r
  36 X-Gm-Message-State:\r
  37  ALoCoQms613rCK9VSgploeyfjuTTTfRDmca9zZPSJzKio1YsHIWFauwYTsyW6vIYO2o/Jr7lvw++\r
  38 X-Received: by 10.15.26.200 with SMTP id n48mr5668130eeu.46.1389305932874;\r
  39         Thu, 09 Jan 2014 14:18:52 -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 p45sm9376819eeg.1.2014.01.09.14.18.51\r
  43         for <multiple recipients>\r
  44         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  45         Thu, 09 Jan 2014 14:18:52 -0800 (PST)\r
  46 From: Jani Nikula <jani@nikula.org>\r
  47 To: notmuch@notmuchmail.org\r
  48 Subject: [PATCH 2/5] test: fix insert folder: searches\r
  49 Date: Fri, 10 Jan 2014 00:18:33 +0200\r
  50 Message-Id:\r
  51  <7eb4b4ee3345e7b166f9dd142435da32ffeffc86.1389304779.git.jani@nikula.org>\r
  52 X-Mailer: git-send-email 1.8.5.2\r
  53 In-Reply-To: <cover.1389304779.git.jani@nikula.org>\r
  54 References: <cover.1389304779.git.jani@nikula.org>\r
  55 In-Reply-To: <cover.1389304779.git.jani@nikula.org>\r
  56 References: <cover.1389304779.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: Fri, 10 Jan 2014 07:33:59 -0000\r
  70 \r
  71 folder: is now boolean prefix.\r
  72 ---\r
  73  test/insert | 10 +++++-----\r
  74  1 file changed, 5 insertions(+), 5 deletions(-)\r
  75 \r
  76 diff --git a/test/insert b/test/insert\r
  77 index e8dc4c0..4bbccd5 100755\r
  78 --- a/test/insert\r
  79 +++ b/test/insert\r
  80 @@ -126,14 +126,14 @@ test_expect_equal "$dirname" "$MAIL_DIR/new"\r
  81  test_begin_subtest "Insert message into folder"\r
  82  gen_insert_msg\r
  83  notmuch insert --folder=Drafts < "$gen_msg_filename"\r
  84 -output=$(notmuch search --output=files folder:Drafts)\r
  85 +output=$(notmuch search --output=files folder:Drafts/new)\r
  86  dirname=$(dirname "$output")\r
  87  test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new"\r
  88  \r
  89  test_begin_subtest "Insert message into folder, add/remove tags"\r
  90  gen_insert_msg\r
  91  notmuch insert --folder=Drafts +draft -unread < "$gen_msg_filename"\r
  92 -output=$(notmuch search --output=messages folder:Drafts tag:draft NOT tag:unread)\r
  93 +output=$(notmuch search --output=messages folder:Drafts/cur tag:draft NOT tag:unread)\r
  94  test_expect_equal "$output" "id:$gen_msg_id"\r
  95  \r
  96  gen_insert_msg\r
  97 @@ -143,21 +143,21 @@ test_expect_code 1 "Insert message into non-existent folder" \\r
  98  test_begin_subtest "Insert message, create folder"\r
  99  gen_insert_msg\r
 100  notmuch insert --folder=F --create-folder +folder < "$gen_msg_filename"\r
 101 -output=$(notmuch search --output=files folder:F tag:folder)\r
 102 +output=$(notmuch search --output=files folder:F/new tag:folder)\r
 103  basename=$(basename "$output")\r
 104  test_expect_equal_file "$gen_msg_filename" "$MAIL_DIR/F/new/${basename}"\r
 105  \r
 106  test_begin_subtest "Insert message, create subfolder"\r
 107  gen_insert_msg\r
 108  notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"\r
 109 -output=$(notmuch search --output=files folder:F/G/H/I/J tag:folder)\r
 110 +output=$(notmuch search --output=files folder:F/G/H/I/J/new tag:folder)\r
 111  basename=$(basename "$output")\r
 112  test_expect_equal_file "$gen_msg_filename" "${MAIL_DIR}/F/G/H/I/J/new/${basename}"\r
 113  \r
 114  test_begin_subtest "Insert message, create existing subfolder"\r
 115  gen_insert_msg\r
 116  notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"\r
 117 -output=$(notmuch count folder:F/G/H/I/J tag:folder)\r
 118 +output=$(notmuch count folder:F/G/H/I/J/new tag:folder)\r
 119  test_expect_equal "$output" "2"\r
 120  \r
 121  gen_insert_msg\r
 122 -- \r
 123 1.8.5.2\r
 124 \r