[Patch v6 4/6] test: add test for notmuch tag --batch option

diff --git a/e7/60e14596cbcad92d40c69868e8d12378d4ad1b b/e7/60e14596cbcad92d40c69868e8d12378d4ad1b
new file mode 100644 (file)
index 0000000..ece1c58
--- /dev/null
+++ b/e7/60e14596cbcad92d40c69868e8d12378d4ad1b
@@ -0,0 +1,130 @@
+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 E6F09431FBC\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Dec 2012 15:33:59 -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 Rm4HjP2SyTke for <notmuch@notmuchmail.org>;\r
+       Sun,  9 Dec 2012 15:33:58 -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 14708429E2E\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Dec 2012 15:33:54 -0800 (PST)\r
+Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([142.167.90.129] 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 1ThqNc-0007TJ-KR; Sun, 09 Dec 2012 19:33:53 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1ThqNX-0001Dp-2z; Sun, 09 Dec 2012 19:33:47 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v6 4/6] test: add test for notmuch tag --batch option\r
+Date: Sun,  9 Dec 2012 19:33:26 -0400\r
+Message-Id: <1355096008-4544-5-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1355096008-4544-1-git-send-email-david@tethera.net>\r
+References: <1355096008-4544-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\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: Sun, 09 Dec 2012 23:34:00 -0000\r
+\r
+From: Jani Nikula <jani@nikula.org>\r
+\r
+Basic test of functionality, along with all combinations of options.\r
+\r
+Modified extensively by David Bremner <david@tethera.net>\r
+\r
+The choice of @ as a tag is intended to be non-alphanumeric, but still\r
+not too much trouble in the shell and in the old sup dump/restore format.\r
+---\r
+ test/tagging |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 1 file changed, 51 insertions(+)\r
+\r
+diff --git a/test/tagging b/test/tagging\r
+index 980ff92..0f3d797 100755\r
+--- a/test/tagging\r
++++ b/test/tagging\r
+@@ -46,6 +46,57 @@ 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"\r
++notmuch tag --batch <<EOF\r
++# %20 is a space in tag\r
++-:"%20 -tag1 +tag5 +tag6 -- One\r
+++tag1 -tag1 -tag4 +tag4 -- Two\r
++-tag6 One\r
+++tag5 Two\r
++EOF\r
++output=$(notmuch search \* | notmuch_search_sanitize)\r
++test_expect_equal "$output" "\\r
++thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag5 unread)\r
++thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag4 tag5 unread)"\r
++\r
++# generate a common input file for the next several tests.\r
++cat > batch.in  <<EOF\r
++# %40 is an @ in tag\r
+++%40 -tag5 +tag6 -- One\r
+++tag1 -tag1 -tag4 +tag4 -- Two\r
++-tag5 +tag6 Two\r
++EOF\r
++\r
++cat > batch.expected <<EOF\r
++thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (@ inbox tag6 unread)\r
++thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag4 tag6 unread)\r
++EOF\r
++\r
++test_begin_subtest "--input"\r
++notmuch dump --format=batch-tag > backup.tags\r
++notmuch tag --input=batch.in\r
++notmuch search \* | notmuch_search_sanitize > OUTPUT.$test_count\r
++notmuch restore --format=batch-tag < backup.tags\r
++test_expect_equal_file batch.expected OUTPUT.$test_count\r
++\r
++test_begin_subtest "--batch --input"\r
++notmuch dump --format=batch-tag > backup.tags\r
++notmuch tag --batch --input=batch.in\r
++notmuch search \* | notmuch_search_sanitize > OUTPUT.$test_count\r
++notmuch restore --format=batch-tag < backup.tags\r
++test_expect_equal_file batch.expected OUTPUT.$test_count\r
++\r
++test_begin_subtest "--batch, blank lines and comments"\r
++notmuch dump | sort > EXPECTED.$test_count\r
++notmuch tag --batch <<EOF\r
++# this line is a comment; the next has only white space\r
++       \r
++\r
++# the previous line is empty\r
++EOF\r
++notmuch dump | sort > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\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