X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnew;h=49f390d61b4a71bf81470f212983ef985f2bdc31;hb=3f44da70b1dab028301641f7cfe5da6e420d60d9;hp=4c6952fd6d31c6834bd7431ecf4561df5fe05e78;hpb=7263aa9ec3f72bb65a491b2c64345ab5258b24ee;p=notmuch diff --git a/test/new b/test/new index 4c6952fd..49f390d6 100755 --- a/test/new +++ b/test/new @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash test_description='"notmuch new" in several variations' . ./test-lib.sh @@ -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 +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." @@ -63,9 +61,8 @@ test_expect_equal "$output" "Added 1 new message to the database." test_begin_subtest "Renamed message" generate_message -$NOTMUCH new > /dev/null +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." @@ -84,10 +80,9 @@ generate_message [dir]=dir generate_message [dir]=dir generate_message [dir]=dir -$NOTMUCH new > /dev/null +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."