[Patch v5 08/11] test: second set of dump/restore --format=batch-tag tests

diff --git a/bf/565f883227edf26ca34ad106b9d1d7cb3ce4af b/bf/565f883227edf26ca34ad106b9d1d7cb3ce4af
new file mode 100644 (file)
index 0000000..fc03967
--- /dev/null
+++ b/bf/565f883227edf26ca34ad106b9d1d7cb3ce4af
@@ -0,0 +1,163 @@
+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 D6F04431FC2\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Dec 2012 14:57:55 -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 g5vZR0Yz71kq for <notmuch@notmuchmail.org>;\r
+       Sat,  8 Dec 2012 14:57:54 -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 4C64E429E43\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Dec 2012 14:57:43 -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 1ThTL4-00066k-8U; Sat, 08 Dec 2012 18:57:42 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1ThTKy-0000qw-Oi; Sat, 08 Dec 2012 18:57:36 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v5 08/11] test: second set of dump/restore --format=batch-tag\r
+       tests\r
+Date: Sat,  8 Dec 2012 18:56:58 -0400\r
+Message-Id: <1355007421-3069-9-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:56 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+These one need the completed functionality in notmuch-restore. Fairly\r
+exotic tags are tested, but no weird message id's.\r
+\r
+We test each possible input to autodetection, both explicit (with\r
+--format=auto) and implicit (without --format).\r
+---\r
+ test/dump-restore |   83 +++++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 1 file changed, 83 insertions(+)\r
+\r
+diff --git a/test/dump-restore b/test/dump-restore\r
+index c700aac..7d91cca 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -98,6 +98,89 @@ 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 "format=batch-tag, # round-trip"\r
++notmuch dump --format=sup | sort > EXPECTED.$test_count\r
++notmuch dump --format=batch-tag | notmuch restore --format=batch-tag\r
++notmuch dump --format=sup | sort > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
++\r
++test_begin_subtest "format=batch-tag, # blank lines and comments"\r
++notmuch dump --format=batch-tag| sort > EXPECTED.$test_count\r
++notmuch restore <<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 --format=batch-tag | sort > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
++\r
++test_begin_subtest "format=batch-tag, # reverse-round-trip empty tag"\r
++cat <<EOF >EXPECTED.$test_count\r
+++ -- id:20091117232137.GA7669@griffis1.net\r
++EOF\r
++notmuch restore --format=batch-tag < EXPECTED.$test_count\r
++notmuch dump --format=batch-tag id:20091117232137.GA7669@griffis1.net > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
++\r
++tag1='comic_swear=$&^%$^%\\//-+$^%$'\r
++enc1=$($TEST_DIRECTORY/hex-xcode --direction=encode "$tag1")\r
++\r
++tag2=$(printf 'this\n tag\t has\n spaces')\r
++enc2=$($TEST_DIRECTORY/hex-xcode --direction=encode "$tag2")\r
++\r
++enc3='%c3%91%c3%a5%c3%b0%c3%a3%c3%a5%c3%a9-%c3%8f%c3%8a'\r
++tag3=$($TEST_DIRECTORY/hex-xcode --direction=decode $enc3)\r
++\r
++notmuch dump --format=batch-tag > BACKUP\r
++\r
++notmuch tag +"$tag1" +"$tag2" +"$tag3" -inbox -unread "*"\r
++\r
++test_begin_subtest 'format=batch-tag, round trip with strange tags'\r
++notmuch dump --format=batch-tag > EXPECTED.$test_count\r
++notmuch dump --format=batch-tag | notmuch restore --format=batch-tag\r
++notmuch dump --format=batch-tag > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
++\r
++test_begin_subtest 'format=batch-tag, checking encoded output'\r
++notmuch dump --format=batch-tag -- from:cworth |\\r
++       awk "{ print \"+$enc1 +$enc2 +$enc3 -- \" \$5 }" > EXPECTED.$test_count\r
++notmuch dump --format=batch-tag -- from:cworth  > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
++\r
++test_begin_subtest 'restoring sane tags'\r
++notmuch restore --format=batch-tag < BACKUP\r
++notmuch dump --format=batch-tag > OUTPUT.$test_count\r
++test_expect_equal_file BACKUP OUTPUT.$test_count\r
++\r
++test_begin_subtest 'format=batch-tag, restore=auto'\r
++notmuch dump --format=batch-tag > EXPECTED.$test_count\r
++notmuch tag -inbox -unread "*"\r
++notmuch restore --format=auto < EXPECTED.$test_count\r
++notmuch dump --format=batch-tag > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
++\r
++test_begin_subtest 'format=sup, restore=auto'\r
++notmuch dump --format=sup > EXPECTED.$test_count\r
++notmuch tag -inbox -unread "*"\r
++notmuch restore --format=auto < EXPECTED.$test_count\r
++notmuch dump --format=sup > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
++\r
++test_begin_subtest 'format=batch-tag, restore=default'\r
++notmuch dump --format=batch-tag > EXPECTED.$test_count\r
++notmuch tag -inbox -unread "*"\r
++notmuch restore < EXPECTED.$test_count\r
++notmuch dump --format=batch-tag > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
++\r
++test_begin_subtest 'format=sup, restore=default'\r
++notmuch dump --format=sup > EXPECTED.$test_count\r
++notmuch tag -inbox -unread "*"\r
++notmuch restore < EXPECTED.$test_count\r
++notmuch dump --format=sup > 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
+ \r
+     ${TEST_DIRECTORY}/random-corpus --config-path=${NOTMUCH_CONFIG} \\r
+-- \r
+1.7.10.4\r
+\r