[PATCH 05/11] test/tagging: add test for error messages of tag --batch

diff --git a/42/f637d531eac2d173847386c8b78856155c5e8f b/42/f637d531eac2d173847386c8b78856155c5e8f
new file mode 100644 (file)
index 0000000..d415470
--- /dev/null
+++ b/42/f637d531eac2d173847386c8b78856155c5e8f
@@ -0,0 +1,113 @@
+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 69745431FB6\r
+       for <notmuch@notmuchmail.org>; Tue, 25 Dec 2012 11:43:21 -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 yqKzO9SVqseG for <notmuch@notmuchmail.org>;\r
+       Tue, 25 Dec 2012 11:43:20 -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 3F40C431FC3\r
+       for <notmuch@notmuchmail.org>; Tue, 25 Dec 2012 11:43:11 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] 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 1TnaP8-0001iH-77; Tue, 25 Dec 2012 15:43:10 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TnaP2-0005nI-Mu; Tue, 25 Dec 2012 15:43:04 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 05/11] test/tagging: add test for error messages of tag\r
+ --batch\r
+Date: Tue, 25 Dec 2012 15:42:41 -0400\r
+Message-Id: <1356464567-21779-6-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1356464567-21779-1-git-send-email-david@tethera.net>\r
+References: <1356464567-21779-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: Tue, 25 Dec 2012 19:43:21 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This is based on the similar test for notmuch restore, but the parser\r
+in batch tagging mode is less tolerant of a few cases, in particular\r
+those tested by illegal_tag.\r
+---\r
+ test/tagging |   35 +++++++++++++++++++++++++++++++++++\r
+ 1 file changed, 35 insertions(+)\r
+\r
+diff --git a/test/tagging b/test/tagging\r
+index 980ff92..cd16585 100755\r
+--- a/test/tagging\r
++++ b/test/tagging\r
+@@ -46,6 +46,41 @@ test_expect_equal "$output" "\\r
+ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (:\"  inbox tag1 unread)\r
+ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag4 unread)"\r
+ \r
++test_begin_subtest '--batch: checking error messages'\r
++notmuch dump --format=batch-tag > BACKUP\r
++notmuch tag --batch <<EOF 2>OUTPUT\r
++# the next line has a space\r
++ \r
++# this line has no tag operations, but this is permitted in batch format.\r
++a\r
+++0\r
+++a +b\r
++# trailing whitespace\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
++# the next non-comment line should report an an empty tag error for\r
++# batch tagging, but not for restore\r
+++ +e -- id:foo\r
+++- -- id:foo\r
++EOF\r
++\r
++cat <<EOF > EXPECTED\r
++Warning: no query string [+0]\r
++Warning: no query string [+a +b]\r
++Warning: missing query string [+a +b ]\r
++Warning: no query string after -- [+c +d --]\r
++Warning: hex decoding of tag %zz failed [+%zz -- id:whatever]\r
++Warning: empty tag forbidden [+ +e -- id:foo]\r
++Warning: tag starting with '-' forbidden [+- -- id:foo]\r
++EOF\r
++\r
++notmuch restore --format=batch-tag < BACKUP\r
++test_expect_equal_file EXPECTED OUTPUT\r
++\r
+ test_expect_code 1 "Empty tag names" 'notmuch tag + One'\r
+ \r
+ test_expect_code 1 "Tag name beginning with -" 'notmuch tag +- One'\r
+-- \r
+1.7.10.4\r
+\r