f3/70e5a6574469dcce9651ed9149e6e5fee95322

   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 3CEFD431FDC\r
   6         for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:05 -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 NlM91JNGYDZb for <notmuch@notmuchmail.org>;\r
  17         Sat, 22 Feb 2014 14:26:00 -0800 (PST)\r
  18 Received: from mail-ea0-f179.google.com (mail-ea0-f179.google.com\r
  19         [209.85.215.179]) (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 CAB54431FCF\r
  22         for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:25:56 -0800 (PST)\r
  23 Received: by mail-ea0-f179.google.com with SMTP id q10so2303975ead.24\r
  24         for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:25:54 -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=bAiHRWWjZsaElIhfrkzflCVDZxrmhvUGvplkzBUpNM0=;\r
  30         b=cyQ5OYgNDNn8FXLtSCPLYKV9bAVntDeNMBfVgHoNAj7i1Y/7klbhru8mQ+TUDOWhk1\r
  31         8NcNLD85PR7Cq08M6VNDhsKZ+bHzpMTfa2aT6zrmpk/i1J4tEuJWK+F0ZmANhbab3Kun\r
  32         KaPFzyw1qUtP+wSkjaxkQc9bC13CwyqpdGNxdwnnd0cNu0upLwyGvHBXRtF1nBC7hx+L\r
  33         58KohMIOXKfipIOUBtGvOKvTGL0RMBfI4cEfhcVAEF5i/APaT00KYq/VdqCe9F/JXIT5\r
  34         5Zj6GwDix/Ow90jtkp4ga40xsiHBlVKvmKGDz+/JLOLUX60xJcOZqZ4zGqHzEI2T8fF9\r
  35         QU+w==\r
  36 X-Gm-Message-State:\r
  37  ALoCoQlhlTuN7YaKzkWZsBCQ4WipEngLnUfSV5SIcMa3ITQUCC60flB8qiACxCHHqiF5GaEEq5GX\r
  38 X-Received: by 10.14.3.72 with SMTP id 48mr16660498eeg.34.1393107954219;\r
  39         Sat, 22 Feb 2014 14:25:54 -0800 (PST)\r
  40 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  41         [88.195.111.91]) by mx.google.com with ESMTPSA id\r
  42         j42sm43781823eep.21.2014.02.22.14.25.53 for <multiple recipients>\r
  43         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  44         Sat, 22 Feb 2014 14:25:53 -0800 (PST)\r
  45 From: Jani Nikula <jani@nikula.org>\r
  46 To: notmuch@notmuchmail.org\r
  47 Subject: [PATCH v2 03/13] test: make insert test use the path: prefix\r
  48 Date: Sun, 23 Feb 2014 00:25:34 +0200\r
  49 Message-Id:\r
  50  <d957fb15689885b21a12fed8fa5563df26e121e8.1393105055.git.jani@nikula.org>\r
  51 X-Mailer: git-send-email 1.8.5.3\r
  52 In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
  53 References: <cover.1393105055.git.jani@nikula.org>\r
  54 In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
  55 References: <cover.1393105055.git.jani@nikula.org>\r
  56 X-BeenThere: notmuch@notmuchmail.org\r
  57 X-Mailman-Version: 2.1.13\r
  58 Precedence: list\r
  59 List-Id: "Use and development of the notmuch mail system."\r
  60         <notmuch.notmuchmail.org>\r
  61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  64 List-Post: <mailto:notmuch@notmuchmail.org>\r
  65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  68 X-List-Received-Date: Sat, 22 Feb 2014 22:26:05 -0000\r
  69 \r
  70 This is a more strict test for the insert test.\r
  71 ---\r
  72  test/T070-insert.sh | 10 +++++-----\r
  73  1 file changed, 5 insertions(+), 5 deletions(-)\r
  74 \r
  75 diff --git a/test/T070-insert.sh b/test/T070-insert.sh\r
  76 index e8dc4c099ed1..5de5da43cebb 100755\r
  77 --- a/test/T070-insert.sh\r
  78 +++ b/test/T070-insert.sh\r
  79 @@ -126,14 +126,14 @@ test_expect_equal "$dirname" "$MAIL_DIR/new"\r
  80  test_begin_subtest "Insert message into folder"\r
  81  gen_insert_msg\r
  82  notmuch insert --folder=Drafts < "$gen_msg_filename"\r
  83 -output=$(notmuch search --output=files folder:Drafts)\r
  84 +output=$(notmuch search --output=files path:Drafts/new)\r
  85  dirname=$(dirname "$output")\r
  86  test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new"\r
  87  \r
  88  test_begin_subtest "Insert message into folder, add/remove tags"\r
  89  gen_insert_msg\r
  90  notmuch insert --folder=Drafts +draft -unread < "$gen_msg_filename"\r
  91 -output=$(notmuch search --output=messages folder:Drafts tag:draft NOT tag:unread)\r
  92 +output=$(notmuch search --output=messages path:Drafts/cur tag:draft NOT tag:unread)\r
  93  test_expect_equal "$output" "id:$gen_msg_id"\r
  94  \r
  95  gen_insert_msg\r
  96 @@ -143,21 +143,21 @@ test_expect_code 1 "Insert message into non-existent folder" \\r
  97  test_begin_subtest "Insert message, create folder"\r
  98  gen_insert_msg\r
  99  notmuch insert --folder=F --create-folder +folder < "$gen_msg_filename"\r
 100 -output=$(notmuch search --output=files folder:F tag:folder)\r
 101 +output=$(notmuch search --output=files path:F/new tag:folder)\r
 102  basename=$(basename "$output")\r
 103  test_expect_equal_file "$gen_msg_filename" "$MAIL_DIR/F/new/${basename}"\r
 104  \r
 105  test_begin_subtest "Insert message, create subfolder"\r
 106  gen_insert_msg\r
 107  notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"\r
 108 -output=$(notmuch search --output=files folder:F/G/H/I/J tag:folder)\r
 109 +output=$(notmuch search --output=files path:F/G/H/I/J/new tag:folder)\r
 110  basename=$(basename "$output")\r
 111  test_expect_equal_file "$gen_msg_filename" "${MAIL_DIR}/F/G/H/I/J/new/${basename}"\r
 112  \r
 113  test_begin_subtest "Insert message, create existing subfolder"\r
 114  gen_insert_msg\r
 115  notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"\r
 116 -output=$(notmuch count folder:F/G/H/I/J tag:folder)\r
 117 +output=$(notmuch count path:F/G/H/I/J/new tag:folder)\r
 118  test_expect_equal "$output" "2"\r
 119  \r
 120  gen_insert_msg\r
 121 -- \r
 122 1.8.5.3\r
 123 \r