From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 875066DE0226 for ; Sun, 29 Apr 2018 16:19:56 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[AWL=0.011, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SgsZgdxUmD2w for ; Sun, 29 Apr 2018 16:19:55 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id D81E16DE01E3 for ; Sun, 29 Apr 2018 16:19:53 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1fCvbl-0008Rw-0H; Sun, 29 Apr 2018 19:19:53 -0400 Received: (nullmailer pid 21838 invoked by uid 1000); Sun, 29 Apr 2018 23:19:51 -0000 From: David Bremner To: Jani Nikula , David Bremner , notmuch@notmuchmail.org Subject: [PATCH 3/4] test: use --full-scan in T050-new.sh Date: Sun, 29 Apr 2018 20:19:42 -0300 Message-Id: <20180429231943.21780-3-david@tethera.net> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180429231943.21780-1-david@tethera.net> References: <874lju7zmv.fsf@nikula.org> <20180429231943.21780-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Apr 2018 23:19:56 -0000 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. --- test/T050-new.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/test/T050-new.sh b/test/T050-new.sh index 1f111142..40c5e6fa 100755 --- a/test/T050-new.sh +++ b/test/T050-new.sh @@ -99,7 +99,7 @@ notmuch new > /dev/null mv "${MAIL_DIR}"/dir "${MAIL_DIR}"/dir-renamed -output=$(NOTMUCH_NEW --debug) +output=$(NOTMUCH_NEW --debug --full-scan) 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." @@ -107,7 +107,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 --full-scan) 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." @@ -126,7 +126,7 @@ test_begin_subtest "Deleted directory (end of list)" rm -rf "${MAIL_DIR}"/zzz -output=$(NOTMUCH_NEW --debug) +output=$(NOTMUCH_NEW --debug --full-scan) 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." @@ -177,7 +177,7 @@ test_begin_subtest "Deleted two-level directory" rm -rf "${MAIL_DIR}"/two -output=$(NOTMUCH_NEW --debug) +output=$(NOTMUCH_NEW --debug --full-scan) 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." @@ -223,7 +223,7 @@ Subject: Test mbox message 2 Body 2. EOF -output=$(NOTMUCH_NEW --debug 2>&1) +output=$(NOTMUCH_NEW --debug --full-scan 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 @@ -258,11 +258,9 @@ test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "Ignore files and directories specified in new.ignore (multiple occurrences)" notmuch config set new.ignore .git ignored_file .ignored_hidden_file notmuch new > /dev/null # ensure that files/folders will be printed in ASCII order. -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 --full-scan 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 @@ -289,7 +287,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 --full-scan 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