[Patch v4 08/10] test/dump-restore: add test for warning/error messages

diff --git a/0b/84341c434e65968c582813dade56095d42c543 b/0b/84341c434e65968c582813dade56095d42c543
new file mode 100644 (file)
index 0000000..5f6ebfa
--- /dev/null
+++ b/0b/84341c434e65968c582813dade56095d42c543
@@ -0,0 +1,107 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id EB1E1429E31\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Dec 2012 07:08:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id qQ-ZFgMnVEmC for <notmuch@notmuchmail.org>;\r
+       Sat,  8 Dec 2012 07:08:28 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8AA20429E4A\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Dec 2012 07:08:15 -0800 (PST)\r
+Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([142.167.90.129] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1ThM0k-0005dR-FM; Sat, 08 Dec 2012 11:08:14 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1ThM0e-0005HC-VO; Sat, 08 Dec 2012 11:08:09 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v4 08/10] test/dump-restore: add test for warning/error\r
+       messages\r
+Date: Sat,  8 Dec 2012 11:07:54 -0400\r
+Message-Id: <1354979276-20099-9-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1354979276-20099-1-git-send-email-david@tethera.net>\r
+References: <1354979276-20099-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 08 Dec 2012 15:08:29 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+We want to test both that error/warning messages are generated when\r
+they should be, and not generated when they should not be. This varies\r
+between restore and batch tagging.\r
+---\r
+ test/dump-restore |   29 +++++++++++++++++++++++++++++\r
+ 1 file changed, 29 insertions(+)\r
+\r
+diff --git a/test/dump-restore b/test/dump-restore\r
+index 7d91cca..b267792 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -181,6 +181,35 @@ notmuch restore < EXPECTED.$test_count\r
+ notmuch dump --format=sup > OUTPUT.$test_count\r
+ test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+ \r
++test_begin_subtest 'restore: checking error messages'\r
++notmuch restore <<EOF 2>OUTPUT\r
+++a +b\r
+++c +d --\r
++# this is a harmless comment, do not yell about it.\r
++\r
++# the previous line was blank; also no yelling please\r
+++%zz -- id:whatever\r
+++e +f id:%yy\r
++# the next line should report an an empty tag error for batch tagging, but restore\r
+++ +e -- id:20091117232137.GA7669@griffis1.net\r
++# highlight the sketchy id parsing; this should be last\r
+++g -- id:foo and bar\r
++EOF\r
++\r
++cat <<EOF > EXPECTED\r
++Warning: no query string: +a +b\r
++Warning: Ignoring invalid input line +a +b\r
++Warning: no query string: +c +d --\r
++Warning: Ignoring invalid input line +c +d --\r
++Warning: Hex decoding of tag %zz failed\r
++Warning: Ignoring invalid input line +%zz -- id:whatever\r
++Warning: Hex decoding of query id:%yy failed\r
++Warning: Ignoring invalid input line +e +f id:%yy\r
++Warning: Cannot apply tags to missing message: foo and bar\r
++EOF\r
++\r
++test_expect_equal_file EXPECTED OUTPUT\r
++\r
+ test_begin_subtest 'roundtripping random message-ids and tags'\r
+ \r
+     ${TEST_DIRECTORY}/random-corpus --config-path=${NOTMUCH_CONFIG} \\r
+-- \r
+1.7.10.4\r
+\r