Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 2F937431FC3 for ; Sat, 8 Dec 2012 14:57:56 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TLOkZpB9mvvb for ; Sat, 8 Dec 2012 14:57:55 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 59ABC429E45 for ; Sat, 8 Dec 2012 14:57:43 -0800 (PST) Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net ([142.167.90.129] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1ThTL4-00066l-Dc; Sat, 08 Dec 2012 18:57:42 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1ThTKy-0000r1-Sy; Sat, 08 Dec 2012 18:57:36 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [Patch v5 09/11] test/dump-restore: add test for warning/error messages Date: Sat, 8 Dec 2012 18:56:59 -0400 Message-Id: <1355007421-3069-10-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355007421-3069-1-git-send-email-david@tethera.net> References: <1355007421-3069-1-git-send-email-david@tethera.net> X-Spam_bar: - Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Sat, 08 Dec 2012 22:57:56 -0000 From: David Bremner We want to test both that error/warning messages are generated when they should be, and not generated when they should not be. This varies between restore and batch tagging. --- test/dump-restore | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/test/dump-restore b/test/dump-restore index 7d91cca..6a989b6 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -181,6 +181,41 @@ notmuch restore < EXPECTED.$test_count notmuch dump --format=sup > OUTPUT.$test_count test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count +test_begin_subtest 'restore: checking error messages' +notmuch restore <OUTPUT +# the next line has a space + +a ++0 ++a +b +# trailing whitespace ++a +b ++c +d -- +# this is a harmless comment, do not yell about it. + +# the previous line was blank; also no yelling please ++%zz -- id:whatever ++e +f id:%yy +# the next non-comment line should report an an empty tag error for +# batch tagging, but not for restore ++ +e -- id:20091117232137.GA7669@griffis1.net +# highlight the sketchy id parsing; this should be last ++g -- id:foo and bar +EOF + +cat < EXPECTED +Warning: unsupported query: a +Warning: no query string [+0] +Warning: no query string [+a +b] +Warning: missing query string [+a +b ] +Warning: no query string after -- [+c +d --] +Warning: hex decoding of tag %zz failed [+%zz -- id:whatever] +Warning: hex decoding of query id:%yy failed [+e +f id:%yy] +Warning: cannot apply tags to missing message: foo and bar +EOF + +test_expect_equal_file EXPECTED OUTPUT + test_begin_subtest 'roundtripping random message-ids and tags' ${TEST_DIRECTORY}/random-corpus --config-path=${NOTMUCH_CONFIG} \ -- 1.7.10.4