On Sun, 29 Apr 2018, David Bremner <da...@tethera.net> wrote: > Wherever the test relies on directories being scanned, this option > should be used to avoid skipping them due to mtimes on directories > matching the database.
I think you could additionally remove a few touch calls in the test. Some of them do actually create empty files, but some of them just touch directories to force rescans. Otherwise, LGTM. BR, Jani. > --- > test/T050-new.sh | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/test/T050-new.sh b/test/T050-new.sh > index 9025fa7a..12dba471 100755 > --- a/test/T050-new.sh > +++ b/test/T050-new.sh > @@ -87,7 +87,7 @@ notmuch new > /dev/null > > mv "${MAIL_DIR}"/dir "${MAIL_DIR}"/dir-renamed > > -output=$(NOTMUCH_NEW --debug) > +output=$(NOTMUCH_NEW --debug --no-mtime-opt) > test_expect_equal "$output" "(D) add_files, pass 2: queuing passed directory > ${MAIL_DIR}/dir for deletion from database > No new mail. Detected 3 file renames." > > @@ -95,7 +95,7 @@ No new mail. Detected 3 file renames." > test_begin_subtest "Deleted directory" > rm -rf "${MAIL_DIR}"/dir-renamed > > -output=$(NOTMUCH_NEW --debug) > +output=$(NOTMUCH_NEW --debug --no-mtime-opt) > test_expect_equal "$output" "(D) add_files, pass 2: queuing passed directory > ${MAIL_DIR}/dir-renamed for deletion from database > No new mail. Removed 3 messages." > > @@ -114,7 +114,7 @@ test_begin_subtest "Deleted directory (end of list)" > > rm -rf "${MAIL_DIR}"/zzz > > -output=$(NOTMUCH_NEW --debug) > +output=$(NOTMUCH_NEW --debug --no-mtime-opt) > test_expect_equal "$output" "(D) add_files, pass 3: queuing leftover > directory ${MAIL_DIR}/zzz for deletion from database > No new mail. Removed 3 messages." > > @@ -165,7 +165,7 @@ test_begin_subtest "Deleted two-level directory" > > rm -rf "${MAIL_DIR}"/two > > -output=$(NOTMUCH_NEW --debug) > +output=$(NOTMUCH_NEW --debug --no-mtime-opt) > test_expect_equal "$output" "(D) add_files, pass 3: queuing leftover > directory ${MAIL_DIR}/two for deletion from database > No new mail. Removed 3 messages." > > @@ -211,7 +211,7 @@ Subject: Test mbox message 2 > > Body 2. > EOF > -output=$(NOTMUCH_NEW --debug 2>&1) > +output=$(NOTMUCH_NEW --debug --no-mtime-opt 2>&1) > test_expect_equal "$output" \ > "Note: Ignoring non-mail file: ${MAIL_DIR}/.git/config > Note: Ignoring non-mail file: ${MAIL_DIR}/.ignored_hidden_file > @@ -234,7 +234,7 @@ touch "${MAIL_DIR}"/.git # change .git's mtime for > notmuch new to rescan. > touch "${MAIL_DIR}" # likewise for MAIL_DIR > mkdir -p "${MAIL_DIR}"/one/two/three/.git > touch "${MAIL_DIR}"/{one,one/two,one/two/three}/ignored_file > -output=$(NOTMUCH_NEW --debug 2>&1 | sort) > +output=$(NOTMUCH_NEW --debug --no-mtime-opt 2>&1 | sort) > test_expect_equal "$output" \ > "(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.git > (D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file > @@ -261,7 +261,7 @@ test_expect_equal "$output" "No new mail." > > test_begin_subtest "Ignore files and directories specified in new.ignore > (regexp)" > notmuch config set new.ignore ".git" "/^bro.*ink\$/" "/ignored.*file/" > -output=$(NOTMUCH_NEW --debug 2>&1 | sort) > +output=$(NOTMUCH_NEW --debug --no-mtime-opt 2>&1 | sort) > test_expect_equal "$output" \ > "(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.git > (D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file > -- > 2.17.0 _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch