1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 2F937431FC3
\r
6 for <notmuch@notmuchmail.org>; Sat, 8 Dec 2012 14:57:56 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id TLOkZpB9mvvb for <notmuch@notmuchmail.org>;
\r
16 Sat, 8 Dec 2012 14:57:55 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 59ABC429E45
\r
21 for <notmuch@notmuchmail.org>; Sat, 8 Dec 2012 14:57:43 -0800 (PST)
\r
22 Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([142.167.90.129] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1ThTL4-00066l-Dc; Sat, 08 Dec 2012 18:57:42 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1ThTKy-0000r1-Sy; Sat, 08 Dec 2012 18:57:36 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [Patch v5 09/11] test/dump-restore: add test for warning/error
\r
35 Date: Sat, 8 Dec 2012 18:56:59 -0400
\r
36 Message-Id: <1355007421-3069-10-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
38 In-Reply-To: <1355007421-3069-1-git-send-email-david@tethera.net>
\r
39 References: <1355007421-3069-1-git-send-email-david@tethera.net>
\r
41 Cc: David Bremner <bremner@debian.org>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Sat, 08 Dec 2012 22:57:56 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 We want to test both that error/warning messages are generated when
\r
59 they should be, and not generated when they should not be. This varies
\r
60 between restore and batch tagging.
\r
62 test/dump-restore | 35 +++++++++++++++++++++++++++++++++++
\r
63 1 file changed, 35 insertions(+)
\r
65 diff --git a/test/dump-restore b/test/dump-restore
\r
66 index 7d91cca..6a989b6 100755
\r
67 --- a/test/dump-restore
\r
68 +++ b/test/dump-restore
\r
69 @@ -181,6 +181,41 @@ notmuch restore < EXPECTED.$test_count
\r
70 notmuch dump --format=sup > OUTPUT.$test_count
\r
71 test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
\r
73 +test_begin_subtest 'restore: checking error messages'
\r
74 +notmuch restore <<EOF 2>OUTPUT
\r
75 +# the next line has a space
\r
80 +# trailing whitespace
\r
83 +# this is a harmless comment, do not yell about it.
\r
85 +# the previous line was blank; also no yelling please
\r
86 ++%zz -- id:whatever
\r
88 +# the next non-comment line should report an an empty tag error for
\r
89 +# batch tagging, but not for restore
\r
90 ++ +e -- id:20091117232137.GA7669@griffis1.net
\r
91 +# highlight the sketchy id parsing; this should be last
\r
92 ++g -- id:foo and bar
\r
95 +cat <<EOF > EXPECTED
\r
96 +Warning: unsupported query: a
\r
97 +Warning: no query string [+0]
\r
98 +Warning: no query string [+a +b]
\r
99 +Warning: missing query string [+a +b ]
\r
100 +Warning: no query string after -- [+c +d --]
\r
101 +Warning: hex decoding of tag %zz failed [+%zz -- id:whatever]
\r
102 +Warning: hex decoding of query id:%yy failed [+e +f id:%yy]
\r
103 +Warning: cannot apply tags to missing message: foo and bar
\r
106 +test_expect_equal_file EXPECTED OUTPUT
\r
108 test_begin_subtest 'roundtripping random message-ids and tags'
\r
110 ${TEST_DIRECTORY}/random-corpus --config-path=${NOTMUCH_CONFIG} \
\r