1 Return-Path: <bremner@tethera.net>
\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 769B2431FD9
\r
6 for <notmuch@notmuchmail.org>; Sat, 8 Mar 2014 13:21:14 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id r866qJ+aEpIZ for <notmuch@notmuchmail.org>;
\r
16 Sat, 8 Mar 2014 13:21:09 -0800 (PST)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 09233431FD8
\r
21 for <notmuch@notmuchmail.org>; Sat, 8 Mar 2014 13:20:34 -0800 (PST)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tethera.net>)
\r
24 id 1WMOfZ-00058y-F2; Sat, 08 Mar 2014 17:20:33 -0400
\r
25 Received: (nullmailer pid 28532 invoked by uid 1000); Sat, 08 Mar 2014
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [Patch v3 03/15] test: make insert test use the path: prefix
\r
30 Date: Sat, 8 Mar 2014 17:19:33 -0400
\r
31 Message-Id: <1394313585-28422-4-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 1.8.5.3
\r
33 In-Reply-To: <1394313585-28422-1-git-send-email-david@tethera.net>
\r
34 References: <1394313585-28422-1-git-send-email-david@tethera.net>
\r
35 X-BeenThere: notmuch@notmuchmail.org
\r
36 X-Mailman-Version: 2.1.13
\r
38 List-Id: "Use and development of the notmuch mail system."
\r
39 <notmuch.notmuchmail.org>
\r
40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
42 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
43 List-Post: <mailto:notmuch@notmuchmail.org>
\r
44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
47 X-List-Received-Date: Sat, 08 Mar 2014 21:21:14 -0000
\r
49 From: Jani Nikula <jani@nikula.org>
\r
51 This is a more strict test for the insert test.
\r
53 test/T070-insert.sh | 10 +++++-----
\r
54 1 file changed, 5 insertions(+), 5 deletions(-)
\r
56 diff --git a/test/T070-insert.sh b/test/T070-insert.sh
\r
57 index b77c5e1..ea9db07 100755
\r
58 --- a/test/T070-insert.sh
\r
59 +++ b/test/T070-insert.sh
\r
60 @@ -126,14 +126,14 @@ test_expect_equal "$dirname" "$MAIL_DIR/new"
\r
61 test_begin_subtest "Insert message into folder"
\r
63 notmuch insert --folder=Drafts < "$gen_msg_filename"
\r
64 -output=$(notmuch search --output=files folder:Drafts)
\r
65 +output=$(notmuch search --output=files path:Drafts/new)
\r
66 dirname=$(dirname "$output")
\r
67 test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new"
\r
69 test_begin_subtest "Insert message into folder, add/remove tags"
\r
71 notmuch insert --folder=Drafts +draft -unread < "$gen_msg_filename"
\r
72 -output=$(notmuch search --output=messages folder:Drafts tag:draft NOT tag:unread)
\r
73 +output=$(notmuch search --output=messages path:Drafts/cur tag:draft NOT tag:unread)
\r
74 test_expect_equal "$output" "id:$gen_msg_id"
\r
77 @@ -143,21 +143,21 @@ test_expect_code 1 "Insert message into non-existent folder" \
\r
78 test_begin_subtest "Insert message, create folder"
\r
80 notmuch insert --folder=F --create-folder +folder < "$gen_msg_filename"
\r
81 -output=$(notmuch search --output=files folder:F tag:folder)
\r
82 +output=$(notmuch search --output=files path:F/new tag:folder)
\r
83 basename=$(basename "$output")
\r
84 test_expect_equal_file "$gen_msg_filename" "$MAIL_DIR/F/new/${basename}"
\r
86 test_begin_subtest "Insert message, create subfolder"
\r
88 notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"
\r
89 -output=$(notmuch search --output=files folder:F/G/H/I/J tag:folder)
\r
90 +output=$(notmuch search --output=files path:F/G/H/I/J/new tag:folder)
\r
91 basename=$(basename "$output")
\r
92 test_expect_equal_file "$gen_msg_filename" "${MAIL_DIR}/F/G/H/I/J/new/${basename}"
\r
94 test_begin_subtest "Insert message, create existing subfolder"
\r
96 notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"
\r
97 -output=$(notmuch count folder:F/G/H/I/J tag:folder)
\r
98 +output=$(notmuch count path:F/G/H/I/J/new tag:folder)
\r
99 test_expect_equal "$output" "2"
\r