From ec0442be1e5d48d73af224b7bc43c96e2cec9cc8 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 4 Aug 2015 08:48:32 +0200 Subject: [PATCH] [PATCH 1/3] test: don't claim single message mbox support is going away --- 99/1336619d9dd498387286e109340edb5076c53c | 93 +++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 99/1336619d9dd498387286e109340edb5076c53c diff --git a/99/1336619d9dd498387286e109340edb5076c53c b/99/1336619d9dd498387286e109340edb5076c53c new file mode 100644 index 000000000..3a0ac979a --- /dev/null +++ b/99/1336619d9dd498387286e109340edb5076c53c @@ -0,0 +1,93 @@ +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 EE9336DE13CC + for ; Mon, 3 Aug 2015 23:50:29 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.148 +X-Spam-Level: +X-Spam-Status: No, score=0.148 tagged_above=-999 required=5 tests=[AWL=0.138, + 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 MNAbZZdv66AG for ; + Mon, 3 Aug 2015 23:50:28 -0700 (PDT) +Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id 1B6556DE10C1 + for ; Mon, 3 Aug 2015 23:50:28 -0700 (PDT) +Received: from remotemail by gitolite.debian.net with local (Exim 4.80) + (envelope-from ) + id 1ZMW2I-0000QM-Ui; Tue, 04 Aug 2015 06:49:18 +0000 +Received: (nullmailer pid 17846 invoked by uid 1000); Tue, 04 Aug 2015 + 06:48:53 -0000 +From: David Bremner +To: Tomi Ollila , David Bremner +Subject: [PATCH 1/3] test: don't claim single message mbox support is going + away +Date: Tue, 4 Aug 2015 08:48:32 +0200 +Message-Id: <1438670914-17203-2-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:30 -0000 + +We gave up on this. +--- + test/T050-new.sh | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/test/T050-new.sh b/test/T050-new.sh +index e6c3291..66ea10f 100755 +--- a/test/T050-new.sh ++++ b/test/T050-new.sh +@@ -63,15 +63,18 @@ test_begin_subtest "Renamed message" + generate_message + notmuch new > /dev/null + mv "$gen_msg_filename" "${gen_msg_filename}"-renamed +-output=$(NOTMUCH_NEW) +-test_expect_equal "$output" "No new mail. Detected 1 file rename." ++output=$(NOTMUCH_NEW --debug) ++test_expect_equal "$output" "(D) add_files_recursive, pass 2: queuing passed file ${gen_msg_filename} for deletion from database ++No new mail. Detected 1 file rename." + + + test_begin_subtest "Deleted message" + + rm "${gen_msg_filename}"-renamed +-output=$(NOTMUCH_NEW) +-test_expect_equal "$output" "No new mail. Removed 1 message." ++output=$(NOTMUCH_NEW --debug) ++test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover file ${gen_msg_filename}-renamed for deletion from database ++No new mail. Removed 1 message." ++ + + + test_begin_subtest "Renamed directory" +@@ -163,7 +166,7 @@ rm -rf "${MAIL_DIR}"/two + output=$(NOTMUCH_NEW) + test_expect_equal "$output" "No new mail. Removed 3 messages." + +-test_begin_subtest "Support single-message mbox (deprecated)" ++test_begin_subtest "Support single-message mbox" + cat > "${MAIL_DIR}"/mbox_file1 < +-- +2.1.4 + -- 2.26.2