--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id EB273431FD6\r
+ for <notmuch@notmuchmail.org>; Sun, 23 Feb 2014 13:41:01 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id AFtJYEo8V-XN for <notmuch@notmuchmail.org>;\r
+ Sun, 23 Feb 2014 13:40:55 -0800 (PST)\r
+Received: from mail-ee0-f50.google.com (mail-ee0-f50.google.com\r
+ [74.125.83.50]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ 78F94431FCF for <notmuch@notmuchmail.org>; Sun, 23 Feb 2014 13:40:55 -0800\r
+ (PST)\r
+Received: by mail-ee0-f50.google.com with SMTP id d17so2802557eek.9\r
+ for <notmuch@notmuchmail.org>; Sun, 23 Feb 2014 13:40:52 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=3kRBxEHl0fbxx2T0N5Ir/ommIVcUgRGFfaKCuMUy+tQ=;\r
+ b=c/SkuS9WVSweTB3O6qTPC62dC51CzTd0hKgtn1Kv23Cipd8XY0frqnyJn82RLeS2xb\r
+ dh5XqM8N7ocqyzUlEx3PJ3kVbaqoIfwSOqMGLJCWFYGc7BDoVPiw1oEoeq7lhEoJSLsL\r
+ boRlhltPIc+vVxqP8B23lIwaYamrlq4YWPFM7aP8rNt76ZgqzjtWWX9vptXca0vEaVtd\r
+ 1xUb3loWYW38wZeHc8SnLmDdMo3NU99ynuwKzfki9QSRnYKQM4KyaqVgcvnfxeqtS7ng\r
+ eVo1ymfNK6q5nggcVTT+mxkXSKyOKlbfbZSqBPHxBYbFjOmWn5UaVC9SJUvj2oMlHSVm\r
+ WEcQ==\r
+X-Gm-Message-State:\r
+ ALoCoQnDKoQqKRN/hyOnRBH6mwGO9N+ph+m1EUiMxdM42qErm7aeonQBsBySIht07xkVoXCYhkRC\r
+X-Received: by 10.15.21.2 with SMTP id c2mr20941297eeu.77.1393191652739;\r
+ Sun, 23 Feb 2014 13:40:52 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91])\r
+ by mx.google.com with ESMTPSA id q44sm55731714eez.1.2014.02.23.13.40.51\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sun, 23 Feb 2014 13:40:51 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org,\r
+ Mark Walters <markwalters1009@gmail.com>\r
+Subject: [PATCH] test: test folder renames\r
+Date: Sun, 23 Feb 2014 23:40:50 +0200\r
+Message-Id: <1393191650-28333-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <87siray6th.fsf@qmul.ac.uk>\r
+References: <87siray6th.fsf@qmul.ac.uk>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 23 Feb 2014 21:41:02 -0000\r
+\r
+On Sun, 23 Feb 2014, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> I was experimenting with letting notmuch new take an argument to tell it\r
+> to scan only a particular directory (and sub-directories) for new\r
+> messages. I came across the following strange behaviour which is also\r
+> present in master (with a fresh database)\r
+>\r
+> I have a bunch of maildirs in /home/mail: so folders .mail.foo/\r
+> .mail.bar/ each of which has cur/new/tmp and all the messages are in\r
+> cur.\r
+>\r
+> If I do mv .mail.foo .mail.bar/ and run notmuch new I get the expected\r
+> lots of renames (900 or so in the case I was trying). But if I then do\r
+> mv .mail.bar/.mail.foo . and run notmuch new almost all the messages get\r
+> removed (but 30 renames do get detected). If I then do touch .mail.foo/*\r
+> the messages get found again\r
+>\r
+> I am guessing the 30 renames might be because those 30 have duplicates\r
+> somewhere else.\r
+>\r
+> But the other behaviour has me puzzled.\r
+\r
+This test reproduces the problem for me, but it's not\r
+deterministic. With the loop, I get roughly one fail per test run:\r
+\r
+ FAIL Rename folder back\r
+ --- T051-new-renames.27.expected 2014-02-23 21:37:10.121774241 +0000\r
+ +++ T051-new-renames.27.output 2014-02-23 21:37:10.121774241 +0000\r
+ @@ -1 +1 @@\r
+ -No new mail. Detected 10 file renames.\r
+ +No new mail. Removed 10 messages.\r
+ FAIL Files remain the same\r
+ --- T051-new-renames.28.expected 2014-02-23 21:37:10.133774652 +0000\r
+ +++ T051-new-renames.28.output 2014-02-23 21:37:10.133774652 +0000\r
+ @@ -1,13 +1,3 @@\r
+ -/path/to/test/tmp.T051-new-renames/mail/foo/msg-121\r
+ -/path/to/test/tmp.T051-new-renames/mail/foo/msg-122\r
+ -/path/to/test/tmp.T051-new-renames/mail/foo/msg-123\r
+ -/path/to/test/tmp.T051-new-renames/mail/foo/msg-124\r
+ -/path/to/test/tmp.T051-new-renames/mail/foo/msg-125\r
+ -/path/to/test/tmp.T051-new-renames/mail/foo/msg-126\r
+ -/path/to/test/tmp.T051-new-renames/mail/foo/msg-127\r
+ -/path/to/test/tmp.T051-new-renames/mail/foo/msg-128\r
+ -/path/to/test/tmp.T051-new-renames/mail/foo/msg-129\r
+ -/path/to/test/tmp.T051-new-renames/mail/foo/msg-130\r
+ /path/to/test/tmp.T051-new-renames/mail/bar/msg-131\r
+ /path/to/test/tmp.T051-new-renames/mail/bar/msg-132\r
+ /path/to/test/tmp.T051-new-renames/mail/bar/msg-133\r
+\r
+I'm as puzzled as you are.\r
+\r
+BR,\r
+Jani.\r
+---\r
+ test/T051-new-renames.sh | 40 ++++++++++++++++++++++++++++++++++++++++\r
+ 1 file changed, 40 insertions(+)\r
+ create mode 100755 test/T051-new-renames.sh\r
+\r
+diff --git a/test/T051-new-renames.sh b/test/T051-new-renames.sh\r
+new file mode 100755\r
+index 000000000000..febe006f5888\r
+--- /dev/null\r
++++ b/test/T051-new-renames.sh\r
+@@ -0,0 +1,40 @@\r
++#!/usr/bin/env bash\r
++test_description='"notmuch new" with directory renames'\r
++. ./test-lib.sh\r
++\r
++for loop in `seq 10`; do\r
++\r
++rm -rf ${MAIL_DIR}\r
++\r
++for i in `seq 10`; do\r
++ generate_message '[dir]=foo' '[subject]="Message foo $i"'\r
++done\r
++\r
++for i in `seq 10`; do\r
++ generate_message '[dir]=bar' '[subject]="Message bar $i"'\r
++done\r
++\r
++test_begin_subtest "Index the messages, round $loop"\r
++output=$(NOTMUCH_NEW)\r
++test_expect_equal "$output" "Added 20 new messages to the database."\r
++\r
++all_files=$(notmuch search --output=files \*)\r
++count_foo=$(notmuch count folder:foo)\r
++\r
++test_begin_subtest "Rename folder"\r
++mv ${MAIL_DIR}/foo ${MAIL_DIR}/baz\r
++output=$(NOTMUCH_NEW)\r
++test_expect_equal "$output" "No new mail. Detected $count_foo file renames."\r
++\r
++test_begin_subtest "Rename folder back"\r
++mv ${MAIL_DIR}/baz ${MAIL_DIR}/foo\r
++output=$(NOTMUCH_NEW)\r
++test_expect_equal "$output" "No new mail. Detected $count_foo file renames."\r
++\r
++test_begin_subtest "Files remain the same"\r
++output=$(notmuch search --output=files \*)\r
++test_expect_equal "$output" "$all_files"\r
++\r
++done\r
++\r
++test_done\r
+-- \r
+1.8.5.3\r
+\r
projects / notmuch-archives.git / commitdiff