From: david Date: Sat, 8 Dec 2012 15:07:54 +0000 (+2000) Subject: [Patch v4 08/10] test/dump-restore: add test for warning/error messages X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f01d773bd604806a71fd5472e13d52eb0f29e66a;p=notmuch-archives.git [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 index 000000000..5f6ebfaa1 --- /dev/null +++ b/0b/84341c434e65968c582813dade56095d42c543 @@ -0,0 +1,107 @@ +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 EB1E1429E31 + for ; Sat, 8 Dec 2012 07:08:28 -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 qQ-ZFgMnVEmC for ; + Sat, 8 Dec 2012 07:08:28 -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 8AA20429E4A + for ; Sat, 8 Dec 2012 07:08:15 -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 1ThM0k-0005dR-FM; Sat, 08 Dec 2012 11:08:14 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1ThM0e-0005HC-VO; Sat, 08 Dec 2012 11:08:09 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v4 08/10] test/dump-restore: add test for warning/error + messages +Date: Sat, 8 Dec 2012 11:07:54 -0400 +Message-Id: <1354979276-20099-9-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1354979276-20099-1-git-send-email-david@tethera.net> +References: <1354979276-20099-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 15:08:29 -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 | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/test/dump-restore b/test/dump-restore +index 7d91cca..b267792 100755 +--- a/test/dump-restore ++++ b/test/dump-restore +@@ -181,6 +181,35 @@ 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 +++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 line should report an an empty tag error for batch tagging, but 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: no query string: +a +b ++Warning: Ignoring invalid input line +a +b ++Warning: no query string: +c +d -- ++Warning: Ignoring invalid input line +c +d -- ++Warning: Hex decoding of tag %zz failed ++Warning: Ignoring invalid input line +%zz -- id:whatever ++Warning: Hex decoding of query id:%yy failed ++Warning: Ignoring invalid input line +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 +