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

diff --git a/df/11a8c2ad0620952d9d2f9e8b481ba3461278e3 b/df/11a8c2ad0620952d9d2f9e8b481ba3461278e3
new file mode 100644 (file)
index 0000000..0c14d33
--- /dev/null
+++ b/df/11a8c2ad0620952d9d2f9e8b481ba3461278e3
@@ -0,0 +1,142 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 BD0E0431FAF\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Dec 2012 09:54:33 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 9-0HM-07Q0RY for <notmuch@notmuchmail.org>;\r
+       Sat,  8 Dec 2012 09:54:33 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 03C42431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Dec 2012 09:54:32 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1ThOba-00038I-32; Sat, 08 Dec 2012 17:54:28 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1ThObZ-0006ra-PV; Sat, 08 Dec 2012 17:54:25 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v4 08/10] test/dump-restore: add test for warning/error\r
+       messages\r
+In-Reply-To: <1354979276-20099-9-git-send-email-david@tethera.net>\r
+References: <1354979276-20099-1-git-send-email-david@tethera.net>\r
+       <1354979276-20099-9-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+155~g7edfdc3 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 08 Dec 2012 17:54:30 +0000\r
+Message-ID: <87r4n0a0q1.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 9d67292a84f15ad19fa6cab86099a571 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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 17:54:33 -0000\r
+\r
+On Sat, 08 Dec 2012, david@tethera.net wrote:\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
+\r
+I don't follow the comment above: do you mean "but not for restore", or\r
+it should report an error but restore anyway or?\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+> +# highlight the sketchy id parsing; this should be last\r
+> ++g -- id:foo and bar\r
+> +EOF\r
+\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r