mirror of
https://git.notmuchmail.org/git/notmuch
synced 2025-01-03 15:21:41 +01:00
test: Nix increment_mtime.
With the fix for the mtime race, this workaround is no longer necessary.
This commit is contained in:
parent
8c39e8d6fb
commit
47afbdfb79
6 changed files with 0 additions and 36 deletions
|
@ -23,7 +23,6 @@ output=$(notmuch search subject:"Adding S flag" | notmuch_search_sanitize)
|
|||
output+="
|
||||
"
|
||||
mv "${gen_msg_filename}" "${gen_msg_filename}S"
|
||||
increment_mtime "$(dirname "${gen_msg_filename}")"
|
||||
output+=$(NOTMUCH_NEW)
|
||||
output+="
|
||||
"
|
||||
|
@ -66,7 +65,6 @@ test_expect_equal "$output" '[[[{"id": "adding-replied-tag@notmuch-test-suite",
|
|||
test_expect_success 'notmuch reply works with renamed file (without notmuch new)' 'notmuch reply id:${gen_msg_id}'
|
||||
|
||||
test_begin_subtest "notmuch new detects no file rename after tag->flag synchronization"
|
||||
increment_mtime "$(dirname ${gen_msg_filename})"
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "No new mail."
|
||||
|
||||
|
@ -77,7 +75,6 @@ output=$(cd "$MAIL_DIR/cur"; ls message-to-move*)
|
|||
test_expect_equal "$output" "message-to-move-to-cur:2,S"
|
||||
|
||||
test_begin_subtest "No rename should be detected by notmuch new"
|
||||
increment_mtime "$MAIL_DIR/cur"
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "No new mail."
|
||||
# (*) If notmuch new was not run we've got "Processed 1 file in almost
|
||||
|
@ -97,7 +94,6 @@ output=$(notmuch search subject:"Removing S flag" | notmuch_search_sanitize)
|
|||
output+="
|
||||
"
|
||||
mv "${gen_msg_filename}" "${gen_msg_filename%S}"
|
||||
increment_mtime "$(dirname "${gen_msg_filename}")"
|
||||
output+=$(NOTMUCH_NEW)
|
||||
output+="
|
||||
"
|
||||
|
@ -110,7 +106,6 @@ test_begin_subtest "Removing info from filename leaves tags unchanged"
|
|||
add_message [subject]='"Message to lose maildir info"' [filename]='message-to-lose-maildir-info' [dir]=cur
|
||||
notmuch tag -unread subject:"Message to lose maildir info"
|
||||
mv "$MAIL_DIR/cur/message-to-lose-maildir-info:2,S" "$MAIL_DIR/cur/message-without-maildir-info"
|
||||
increment_mtime "$MAIL_DIR/cur"
|
||||
output=$(NOTMUCH_NEW)
|
||||
output+="
|
||||
"
|
||||
|
@ -134,7 +129,6 @@ mv $MAIL_DIR/cur/adding-replied-tag:2,RS $MAIL_DIR/cur/adding-replied-tag:2,S
|
|||
mv $MAIL_DIR/cur/adding-s-flag:2,S $MAIL_DIR/cur/adding-s-flag:2,
|
||||
mv $MAIL_DIR/cur/adding-with-s-flag:2,S $MAIL_DIR/cur/adding-with-s-flag:2,RS
|
||||
mv $MAIL_DIR/cur/message-to-move-to-cur:2,S $MAIL_DIR/cur/message-to-move-to-cur:2,DS
|
||||
increment_mtime $MAIL_DIR/cur
|
||||
notmuch dump dump.txt
|
||||
NOTMUCH_NEW >/dev/null
|
||||
notmuch restore dump.txt
|
||||
|
@ -144,7 +138,6 @@ test_expect_equal "$output" "$expected"
|
|||
test_begin_subtest 'Adding flags to duplicate message tags the mail'
|
||||
add_message [subject]='"Duplicated message"' [dir]=cur [filename]='duplicated-message:2,'
|
||||
cp "$MAIL_DIR/cur/duplicated-message:2," "$MAIL_DIR/cur/duplicated-message-copy:2,RS"
|
||||
increment_mtime $MAIL_DIR/cur
|
||||
NOTMUCH_NEW > output
|
||||
notmuch search subject:"Duplicated message" | notmuch_search_sanitize >> output
|
||||
test_expect_equal "$(< output)" "No new mail.
|
||||
|
@ -152,7 +145,6 @@ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Duplicated message (inbox repl
|
|||
|
||||
test_begin_subtest "Adding duplicate message without flags does not remove tags"
|
||||
cp "$MAIL_DIR/cur/duplicated-message-copy:2,RS" "$MAIL_DIR/cur/duplicated-message-another-copy:2,"
|
||||
increment_mtime $MAIL_DIR/cur
|
||||
NOTMUCH_NEW > output
|
||||
notmuch search subject:"Duplicated message" | notmuch_search_sanitize >> output
|
||||
test_expect_equal "$(< output)" "No new mail.
|
||||
|
|
|
@ -88,7 +88,6 @@ Content-Transfer-Encoding: base64
|
|||
7w0K
|
||||
--==-=-=--
|
||||
EOF
|
||||
increment_mtime "$MAIL_DIR"
|
||||
notmuch new > /dev/null
|
||||
|
||||
test_begin_subtest "--format=text --part=0, full message"
|
||||
|
|
9
test/new
9
test/new
|
@ -52,10 +52,8 @@ generate_message
|
|||
tmp_msg_filename=tmp/"$gen_msg_filename"
|
||||
mkdir -p "$(dirname "$tmp_msg_filename")"
|
||||
mv "$gen_msg_filename" "$tmp_msg_filename"
|
||||
increment_mtime "${MAIL_DIR}"
|
||||
notmuch new > /dev/null
|
||||
mv "$tmp_msg_filename" "$gen_msg_filename"
|
||||
increment_mtime "${MAIL_DIR}"
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "Added 1 new message to the database."
|
||||
|
||||
|
@ -65,7 +63,6 @@ test_begin_subtest "Renamed message"
|
|||
generate_message
|
||||
notmuch new > /dev/null
|
||||
mv "$gen_msg_filename" "${gen_msg_filename}"-renamed
|
||||
increment_mtime "${MAIL_DIR}"
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "No new mail. Detected 1 file rename."
|
||||
|
||||
|
@ -73,7 +70,6 @@ test_expect_equal "$output" "No new mail. Detected 1 file rename."
|
|||
test_begin_subtest "Deleted message"
|
||||
|
||||
rm "${gen_msg_filename}"-renamed
|
||||
increment_mtime "${MAIL_DIR}"
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "No new mail. Removed 1 message."
|
||||
|
||||
|
@ -87,7 +83,6 @@ generate_message [dir]=dir
|
|||
notmuch new > /dev/null
|
||||
|
||||
mv "${MAIL_DIR}"/dir "${MAIL_DIR}"/dir-renamed
|
||||
increment_mtime "${MAIL_DIR}"
|
||||
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "No new mail. Detected 3 file renames."
|
||||
|
@ -96,7 +91,6 @@ test_expect_equal "$output" "No new mail. Detected 3 file renames."
|
|||
test_begin_subtest "Deleted directory"
|
||||
|
||||
rm -rf "${MAIL_DIR}"/dir-renamed
|
||||
increment_mtime "${MAIL_DIR}"
|
||||
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "No new mail. Removed 3 messages."
|
||||
|
@ -115,7 +109,6 @@ test_expect_equal "$output" "Added 3 new messages to the database."
|
|||
test_begin_subtest "Deleted directory (end of list)"
|
||||
|
||||
rm -rf "${MAIL_DIR}"/zzz
|
||||
increment_mtime "${MAIL_DIR}"
|
||||
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "No new mail. Removed 3 messages."
|
||||
|
@ -139,7 +132,6 @@ external_msg_filename="$PWD"/external/"$(basename "$gen_msg_filename")"
|
|||
mkdir -p "$(dirname "$external_msg_filename")"
|
||||
mv "$gen_msg_filename" "$external_msg_filename"
|
||||
ln -s "$external_msg_filename" "$gen_msg_filename"
|
||||
increment_mtime "${MAIL_DIR}"
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "Added 1 new message to the database."
|
||||
|
||||
|
@ -157,7 +149,6 @@ test_expect_equal "$output" "Added 3 new messages to the database."
|
|||
test_begin_subtest "Deleted two-level directory"
|
||||
|
||||
rm -rf "${MAIL_DIR}"/two
|
||||
increment_mtime "${MAIL_DIR}"
|
||||
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "No new mail. Removed 3 messages."
|
||||
|
|
|
@ -23,14 +23,12 @@ test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; B
|
|||
|
||||
test_begin_subtest "After removing duplicate instance of matching path"
|
||||
rm -r "${MAIL_DIR}/bad/news"
|
||||
increment_mtime "${MAIL_DIR}/bad"
|
||||
notmuch new
|
||||
output=$(notmuch search folder:bad/news | notmuch_search_sanitize)
|
||||
test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Bears (inbox unread)"
|
||||
|
||||
test_begin_subtest "After rename, old path returns nothing"
|
||||
mv "${MAIL_DIR}/duplicate/bad/news" "${MAIL_DIR}/duplicate/bad/olds"
|
||||
increment_mtime "${MAIL_DIR}/duplicate/bad"
|
||||
notmuch new
|
||||
output=$(notmuch search folder:bad/news | notmuch_search_sanitize)
|
||||
test_expect_equal "$output" ""
|
||||
|
|
|
@ -36,7 +36,6 @@ test_expect_equal "$output" "thread:0000000000000001 2001-01-05 [1/1] Notmuch
|
|||
|
||||
test_begin_subtest "Remove folder:spam copy of email"
|
||||
rm $dir/spam/$(basename $file_x)
|
||||
increment_mtime $dir/spam
|
||||
output=$(NOTMUCH_NEW)
|
||||
test_expect_equal "$output" "No new mail. Detected 1 file rename."
|
||||
|
||||
|
|
|
@ -213,16 +213,6 @@ remove_cr () {
|
|||
tr '\015' Q | sed -e 's/Q$//'
|
||||
}
|
||||
|
||||
# Notmuch helper functions
|
||||
increment_mtime_amount=0
|
||||
increment_mtime ()
|
||||
{
|
||||
dir="$1"
|
||||
|
||||
increment_mtime_amount=$((increment_mtime_amount + 1))
|
||||
touch -d "+${increment_mtime_amount} seconds" "$dir"
|
||||
}
|
||||
|
||||
# Generate a new message in the mail directory, with a unique message
|
||||
# ID and subject. The message is not added to the index.
|
||||
#
|
||||
|
@ -364,9 +354,6 @@ Date: ${template[date]}
|
|||
${additional_headers}
|
||||
${template[body]}
|
||||
EOF
|
||||
|
||||
# Ensure that the mtime of the containing directory is updated
|
||||
increment_mtime "$(dirname "${gen_msg_filename}")"
|
||||
}
|
||||
|
||||
# Generate a new message and add it to the database.
|
||||
|
@ -409,8 +396,6 @@ emacs_deliver_message ()
|
|||
$@
|
||||
(message-send-and-exit))" >/dev/null 2>&1
|
||||
wait ${smtp_dummy_pid}
|
||||
increment_mtime "$MAIL_DIR"/sent/cur
|
||||
increment_mtime "$MAIL_DIR"/sent/new
|
||||
notmuch new >/dev/null
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue