[Patch v5 02/11] test: add sanity check for dump --format=batch-tag.

diff --git a/a1/a67fcdc80a069e9665136535adc7565d58f099 b/a1/a67fcdc80a069e9665136535adc7565d58f099
new file mode 100644 (file)
index 0000000..3c5df35
--- /dev/null
+++ b/a1/a67fcdc80a069e9665136535adc7565d58f099
@@ -0,0 +1,89 @@
+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 6869E431FC0\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Dec 2012 14:57:49 -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 91AugblmAONI for <notmuch@notmuchmail.org>;\r
+       Sat,  8 Dec 2012 14:57:48 -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 38910431FC3\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Dec 2012 14:57:42 -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 1ThTL3-00066e-9u; Sat, 08 Dec 2012 18:57:41 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1ThTKx-0000qS-RQ; Sat, 08 Dec 2012 18:57:35 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v5 02/11] test: add sanity check for dump --format=batch-tag.\r
+Date: Sat,  8 Dec 2012 18:56:52 -0400\r
+Message-Id: <1355007421-3069-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1355007421-3069-1-git-send-email-david@tethera.net>\r
+References: <1355007421-3069-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: Sat, 08 Dec 2012 22:57:49 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+It's important this does not rely on restore, since it hasn't been\r
+written yet.\r
+---\r
+ test/dump-restore |   13 +++++++++++++\r
+ 1 file changed, 13 insertions(+)\r
+\r
+diff --git a/test/dump-restore b/test/dump-restore\r
+index bf31266..b4c807f 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -85,6 +85,19 @@ test_begin_subtest "dump --output=outfile -- from:cworth"\r
+ notmuch dump --output=dump-outfile-dash-inbox.actual -- from:cworth\r
+ test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual\r
+ \r
++test_begin_subtest "Check for a safe set of message-ids"\r
++notmuch search --output=messages from:cworth | sed s/^id:// > EXPECTED\r
++notmuch search --output=messages from:cworth | sed s/^id:// |\\r
++      $TEST_DIRECTORY/hex-xcode --direction=encode > OUTPUT\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "format=batch-tag, dump sanity check."\r
++notmuch dump --format=sup from:cworth | cut -f1 -d' ' | \\r
++    sort > EXPECTED.$test_count\r
++notmuch dump --format=batch-tag from:cworth | sed 's/^.*-- id://' | \\r
++    sort > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
++\r
+ test_begin_subtest 'roundtripping random message-ids and tags'\r
+     test_subtest_known_broken\r
+     ${TEST_DIRECTORY}/random-corpus --config-path=${NOTMUCH_CONFIG} \\r
+-- \r
+1.7.10.4\r
+\r