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 466BE431FD6
\r
6 for <notmuch@notmuchmail.org>; Mon, 2 Sep 2013 18:10:44 -0700 (PDT)
\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 KZoAUY4Lyue0 for <notmuch@notmuchmail.org>;
\r
16 Mon, 2 Sep 2013 18:10:37 -0700 (PDT)
\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 97698431FD2
\r
21 for <notmuch@notmuchmail.org>; Mon, 2 Sep 2013 18:10:37 -0700 (PDT)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tethera.net>)
\r
24 id 1VGf8Z-0002XW-54; Mon, 02 Sep 2013 22:10:31 -0300
\r
25 Received: (nullmailer pid 3632 invoked by uid 1000); Tue, 03 Sep 2013
\r
27 From: david@tethera.net
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH] test: update insert tests for new maildir synchronization
\r
31 Date: Mon, 2 Sep 2013 22:10:13 -0300
\r
32 Message-Id: <1378170613-3584-1-git-send-email-david@tethera.net>
\r
33 X-Mailer: git-send-email 1.8.3.2
\r
34 In-Reply-To: <1355952747-27350-4-git-send-email-sojkam1@fel.cvut.cz>
\r
35 References: <1355952747-27350-4-git-send-email-sojkam1@fel.cvut.cz>
\r
36 Cc: David Bremner <bremner@debian.org>
\r
37 X-BeenThere: notmuch@notmuchmail.org
\r
38 X-Mailman-Version: 2.1.13
\r
40 List-Id: "Use and development of the notmuch mail system."
\r
41 <notmuch.notmuchmail.org>
\r
42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
45 List-Post: <mailto:notmuch@notmuchmail.org>
\r
46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
49 X-List-Received-Date: Tue, 03 Sep 2013 01:10:44 -0000
\r
51 From: David Bremner <bremner@debian.org>
\r
53 As of id:1355952747-27350-4-git-send-email-sojkam1@fel.cvut.cz
\r
54 we are more conservative about moving messages from ./new to ./cur.
\r
55 This updates the insert tests to match
\r
58 Hopefully this makes sense, and is not just papering over a real
\r
59 problem that should be fixed.
\r
61 test/insert | 6 +++---
\r
62 1 file changed, 3 insertions(+), 3 deletions(-)
\r
64 diff --git a/test/insert b/test/insert
\r
65 index 021edb6..1718120 100755
\r
68 @@ -82,7 +82,7 @@ gen_insert_msg
\r
69 notmuch insert --folder=Drafts < "$gen_msg_filename"
\r
70 output=$(notmuch search --output=files folder:Drafts)
\r
71 dirname=$(dirname "$output")
\r
72 -test_expect_equal "$dirname" "$MAIL_DIR/Drafts/cur"
\r
73 +test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new"
\r
75 test_begin_subtest "Insert message into folder, add/remove tags"
\r
77 @@ -99,14 +99,14 @@ gen_insert_msg
\r
78 notmuch insert --folder=F --create-folder +folder < "$gen_msg_filename"
\r
79 output=$(notmuch search --output=files folder:F tag:folder)
\r
80 basename=$(basename "$output")
\r
81 -test_expect_equal_file "$gen_msg_filename" "$MAIL_DIR/F/cur/${basename}"
\r
82 +test_expect_equal_file "$gen_msg_filename" "$MAIL_DIR/F/new/${basename}"
\r
84 test_begin_subtest "Insert message, create subfolder"
\r
86 notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"
\r
87 output=$(notmuch search --output=files folder:F/G/H/I/J tag:folder)
\r
88 basename=$(basename "$output")
\r
89 -test_expect_equal_file "$gen_msg_filename" "${MAIL_DIR}/F/G/H/I/J/cur/${basename}"
\r
90 +test_expect_equal_file "$gen_msg_filename" "${MAIL_DIR}/F/G/H/I/J/new/${basename}"
\r
92 test_begin_subtest "Insert message, create existing subfolder"
\r