From dec52e13eee21e785eca7a4e5c4426fa48073a84 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 4 Aug 2015 08:48:34 +0200 Subject: [PATCH] [PATCH 3/3] test: add debugging output to notmuch-new tests, mark 5 as broken --- 1c/beaabbc21b6ec6d7ee391bb87c31451e4b2fb2 | 268 ++++++++++++++++++++++ 1 file changed, 268 insertions(+) create mode 100644 1c/beaabbc21b6ec6d7ee391bb87c31451e4b2fb2 diff --git a/1c/beaabbc21b6ec6d7ee391bb87c31451e4b2fb2 b/1c/beaabbc21b6ec6d7ee391bb87c31451e4b2fb2 new file mode 100644 index 000000000..6a4069197 --- /dev/null +++ b/1c/beaabbc21b6ec6d7ee391bb87c31451e4b2fb2 @@ -0,0 +1,268 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 37C056DE1502 + for ; Mon, 3 Aug 2015 23:50:44 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.147 +X-Spam-Level: +X-Spam-Status: No, score=0.147 tagged_above=-999 required=5 tests=[AWL=0.137, + T_HEADER_FROM_DIFFERENT_DOMAINS=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 cP2gJ-PAncDV for ; + Mon, 3 Aug 2015 23:50:42 -0700 (PDT) +Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id 3767E6DE13A8 + for ; Mon, 3 Aug 2015 23:50:42 -0700 (PDT) +Received: from remotemail by gitolite.debian.net with local (Exim 4.80) + (envelope-from ) + id 1ZMW2X-0000QU-Ci; Tue, 04 Aug 2015 06:49:33 +0000 +Received: (nullmailer pid 17858 invoked by uid 1000); Tue, 04 Aug 2015 + 06:48:57 -0000 +From: David Bremner +To: Tomi Ollila , David Bremner +Subject: [PATCH 3/3] test: add debugging output to notmuch-new tests, mark 5 + as broken +Date: Tue, 4 Aug 2015 08:48:34 +0200 +Message-Id: <1438670914-17203-4-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1438670914-17203-1-git-send-email-david@tethera.net> +References: + <1438670914-17203-1-git-send-email-david@tethera.net> +Cc: notmuch@notmuchmail.org +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +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: Tue, 04 Aug 2015 06:50:44 -0000 + +I marked the tests where I really couldn't understand the output as +broken. It could also be that I don't understand how directory removal +is supposed to work. +--- + test/T050-new.sh | 62 ++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 35 insertions(+), 27 deletions(-) + +diff --git a/test/T050-new.sh b/test/T050-new.sh +index ab15ca1..ff1c354 100755 +--- a/test/T050-new.sh ++++ b/test/T050-new.sh +@@ -3,25 +3,25 @@ test_description='"notmuch new" in several variations' + . ./test-lib.sh + + test_begin_subtest "No new messages" +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "No new mail." + + + test_begin_subtest "Single new message" + generate_message +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "Added 1 new message to the database." + + + test_begin_subtest "Multiple new messages" + generate_message + generate_message +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "Added 2 new messages to the database." + + + test_begin_subtest "No new messages (non-empty DB)" +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "No new mail." + + +@@ -31,7 +31,7 @@ mkdir "${MAIL_DIR}"/def + mkdir "${MAIL_DIR}"/ghi + generate_message [dir]=def + +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "Added 1 new message to the database." + + +@@ -42,7 +42,7 @@ mv "${MAIL_DIR}"/ghi "${MAIL_DIR}"/abc + rm "${MAIL_DIR}"/def/* + generate_message [dir]=abc + +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "Added 1 new message to the database." + + +@@ -54,7 +54,7 @@ mkdir -p "$(dirname "$tmp_msg_filename")" + mv "$gen_msg_filename" "$tmp_msg_filename" + notmuch new > /dev/null + mv "$tmp_msg_filename" "$gen_msg_filename" +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "Added 1 new message to the database." + + +@@ -87,34 +87,39 @@ notmuch new > /dev/null + + mv "${MAIL_DIR}"/dir "${MAIL_DIR}"/dir-renamed + +-output=$(NOTMUCH_NEW) +-test_expect_equal "$output" "No new mail. Detected 3 file renames." ++output=$(NOTMUCH_NEW --debug) ++test_expect_equal "$output" "(D) add_files_recursive, pass 2: queuing passed directory ${MAIL_DIR}/dir for deletion from database ++No new mail. Detected 3 file renames." + + + test_begin_subtest "Deleted directory" +- ++test_subtest_known_broken + rm -rf "${MAIL_DIR}"/dir-renamed + +-output=$(NOTMUCH_NEW) +-test_expect_equal "$output" "No new mail. Removed 3 messages." ++output=$(NOTMUCH_NEW --debug) ++test_expect_equal "$output" "(D) add_files_recursive, pass 2: queuing passed directory ${MAIL_DIR}/dir-renamed for deletion from database ++No new mail. Removed 3 messages." + + + test_begin_subtest "New directory (at end of list)" ++test_subtest_known_broken + + generate_message [dir]=zzz + generate_message [dir]=zzz + generate_message [dir]=zzz + +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "Added 3 new messages to the database." + + + test_begin_subtest "Deleted directory (end of list)" + ++test_subtest_known_broken + rm -rf "${MAIL_DIR}"/zzz + +-output=$(NOTMUCH_NEW) +-test_expect_equal "$output" "No new mail. Removed 3 messages." ++output=$(NOTMUCH_NEW --debug) ++test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover directory ${MAIL_DIR}/zzz for deletion from database ++No new mail. Removed 3 messages." + + + test_begin_subtest "New symlink to directory" +@@ -125,7 +130,7 @@ mv "${MAIL_DIR}" "${TMP_DIRECTORY}"/actual_maildir + mkdir "${MAIL_DIR}" + ln -s "${TMP_DIRECTORY}"/actual_maildir "${MAIL_DIR}"/symlink + +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "Added 1 new message to the database." + + +@@ -135,13 +140,13 @@ external_msg_filename="${TMP_DIRECTORY}"/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" +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "Added 1 new message to the database." + + + test_begin_subtest "Broken symlink aborts" + ln -s does-not-exist "${MAIL_DIR}/broken" +-output=$(NOTMUCH_NEW 2>&1) ++output=$(NOTMUCH_NEW --debug 2>&1) + test_expect_equal "$output" \ + "Error reading file ${MAIL_DIR}/broken: No such file or directory + Note: A fatal error was encountered: Something went wrong trying to read or write a file +@@ -155,7 +160,7 @@ generate_message [dir]=two/levels + generate_message [dir]=two/levels + generate_message [dir]=two/levels + +-output=$(NOTMUCH_NEW) ++output=$(NOTMUCH_NEW --debug) + test_expect_equal "$output" "Added 3 new messages to the database." + + +@@ -163,10 +168,12 @@ test_begin_subtest "Deleted two-level directory" + + rm -rf "${MAIL_DIR}"/two + +-output=$(NOTMUCH_NEW) +-test_expect_equal "$output" "No new mail. Removed 3 messages." ++output=$(NOTMUCH_NEW --debug) ++test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover directory ${MAIL_DIR}/two for deletion from database ++No new mail. Removed 3 messages." + + test_begin_subtest "Support single-message mbox" ++test_subtest_known_broken + cat > "${MAIL_DIR}"/mbox_file1 < +@@ -175,11 +182,12 @@ Subject: Test mbox message 1 + + Body. + EOF +-output=$(NOTMUCH_NEW 2>&1) ++output=$(NOTMUCH_NEW --debug 2>&1) + test_expect_equal "$output" "Added 1 new message to the database." + + # This test requires that notmuch new has been run at least once. + test_begin_subtest "Skip and report non-mail files" ++test_subtest_known_broken + generate_message + mkdir -p "${MAIL_DIR}"/.git && touch "${MAIL_DIR}"/.git/config + touch "${MAIL_DIR}"/ignored_file +@@ -199,7 +207,7 @@ Subject: Test mbox message 2 + + Body 2. + EOF +-output=$(NOTMUCH_NEW 2>&1) ++output=$(NOTMUCH_NEW --debug 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 +@@ -267,23 +275,23 @@ OLDCONFIG=$(notmuch config get new.tags) + + test_begin_subtest "Empty tags in new.tags are forbidden" + notmuch config set new.tags "foo;;bar" +-output=$(NOTMUCH_NEW 2>&1) ++output=$(NOTMUCH_NEW --debug 2>&1) + test_expect_equal "$output" "Error: tag '' in new.tags: empty tag forbidden" + + test_begin_subtest "Tags starting with '-' in new.tags are forbidden" + notmuch config set new.tags "-foo;bar" +-output=$(NOTMUCH_NEW 2>&1) ++output=$(NOTMUCH_NEW --debug 2>&1) + test_expect_equal "$output" "Error: tag '-foo' in new.tags: tag starting with '-' forbidden" + + test_expect_code 1 "Invalid tags set exit code" \ +- "NOTMUCH_NEW 2>&1" ++ "NOTMUCH_NEW --debug 2>&1" + + notmuch config set new.tags $OLDCONFIG + + + test_begin_subtest "Xapian exception: read only files" + chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.DB +-output=$(NOTMUCH_NEW 2>&1 | sed 's/: .*$//' ) ++output=$(NOTMUCH_NEW --debug 2>&1 | sed 's/: .*$//' ) + chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.DB + test_expect_equal "$output" "A Xapian exception occurred opening database" + +-- +2.1.4 + -- 2.26.2