[PATCH] test: update dump-restore roundtripping test for batch-tag format

diff --git a/22/9b3b98e78bbf35ad0989305f630d7c43468b24 b/22/9b3b98e78bbf35ad0989305f630d7c43468b24
new file mode 100644 (file)
index 0000000..3c7c11f
--- /dev/null
+++ b/22/9b3b98e78bbf35ad0989305f630d7c43468b24
@@ -0,0 +1,102 @@
+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 25E25431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:16:57 -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 Ewp+SfNG8FIX for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 17:16:56 -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 A613C431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:16:56 -0800 (PST)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] 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 1TcQq7-0006fZ-79; Sat, 24 Nov 2012 21:16:55 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TcQq1-0005jt-Lx; Sat, 24 Nov 2012 21:16:49 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: update dump-restore roundtripping test for batch-tag\r
+       format\r
+Date: Sat, 24 Nov 2012 21:16:48 -0400\r
+Message-Id: <1353806208-21965-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <m2zk26ioaw.fsf@guru.guru-group.fi>\r
+References: <m2zk26ioaw.fsf@guru.guru-group.fi>\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: Sun, 25 Nov 2012 01:16:57 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+Now we can actually round trip these crazy tags and and message ids.\r
+hex-xcode is no longer needed as it's built in.\r
+---\r
+\r
+\r
+I played with this a bit to try to make the diff nicer; I'm not sure\r
+if I really improved much, but putting the sort into the original test\r
+was a bug fix anyway. This is really for review; I don't think it will\r
+apply without also resending 6/14.\r
+\r
+ test/dump-restore |   14 ++++++--------\r
+ 1 file changed, 6 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/test/dump-restore b/test/dump-restore\r
+index 28474f5..e9ba79d 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -86,18 +86,16 @@ 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_expect_success 'roundtripping random message-ids and tags' \\r
+-    'test_subtest_known_broken &&\r
+-     ${TEST_DIRECTORY}/random-corpus --num-messages=10 \\r
++     '${TEST_DIRECTORY}/random-corpus --num-messages=100 \\r
+        --config-path=${NOTMUCH_CONFIG} &&\r
+-     notmuch dump |\r
+-       ${TEST_DIRECTORY}/hex-xcode --direction=encode |\r
++     notmuch dump --format=batch-tag |\r
+        sort > EXPECTED.$test_count &&\r
+      notmuch tag -random-corpus tag:random-corpus &&\r
+-     ${TEST_DIRECTORY}/hex-xcode --direction=decode < EXPECTED.$test_count |\r
+-       notmuch restore 2>/dev/null &&\r
+-     notmuch dump |\r
+-       ${TEST_DIRECTORY}/hex-xcode --direction=encode |\r
++     notmuch restore --format=batch-tag < EXPECTED.$test_count &&\r
++     notmuch dump --format=batch-tag |\r
+        sort > OUTPUT.$test_count &&\r
+      test_cmp EXPECTED.$test_count OUTPUT.$test_count'\r
+ \r
+ test_done\r
++\r
++# Note the database is "poisoned" for sup format at this point.\r
+-- \r
+1.7.10.4\r
+\r