[PATCH v3 07/10] test: second set of dump/restore --format=notmuch tests

diff --git a/e1/93133f678e0ccf59c1fb04b111606ecfe184bf b/e1/93133f678e0ccf59c1fb04b111606ecfe184bf
new file mode 100644 (file)
index 0000000..2729a3b
--- /dev/null
+++ b/e1/93133f678e0ccf59c1fb04b111606ecfe184bf
@@ -0,0 +1,144 @@
+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 F2DD5404511\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Jan 2012 17:40:46 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 qVV1Rjvmn7QZ for <notmuch@notmuchmail.org>;\r
+       Sat, 14 Jan 2012 17:40:46 -0800 (PST)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D8185414391\r
+       for <notmuch@notmuchmail.org>; Sat, 14 Jan 2012 17:40:45 -0800 (PST)\r
+Received: from zancas.localnet\r
+       (fctnnbsc36w-156034076032.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [156.34.76.32]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q0F1efsu008573\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Sat, 14 Jan 2012 21:40:44 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.77)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1RmF5N-00042y-IJ; Sat, 14 Jan 2012 21:40:41 -0400\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 07/10] test: second set of dump/restore --format=notmuch\r
+       tests\r
+Date: Sat, 14 Jan 2012 21:40:21 -0400\r
+Message-Id: <1326591624-15493-8-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1326591624-15493-1-git-send-email-david@tethera.net>\r
+References: <874nwxbkhr.fsf@zancas.localnet>\r
+       <1326591624-15493-1-git-send-email-david@tethera.net>\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, 15 Jan 2012 01:40:47 -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 |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 1 files changed, 66 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/dump-restore b/test/dump-restore\r
+index 0e210d3..60ae68e 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -94,4 +94,70 @@ notmuch dump --format=sup -- from:cworth | tr -d \(\) > EXPECTED.$test_count\r
+ notmuch dump --format=notmuch -- from:cworth > OUTPUT.$test_count\r
+ test_expect_equal_file OUTPUT.$test_count EXPECTED.$test_count\r
+ \r
++test_begin_subtest "format=notmuch, # round-trip"\r
++notmuch dump --format=sup | sort > EXPECTED.$test_count\r
++notmuch dump --format=notmuch | notmuch restore --format=notmuch\r
++notmuch dump --format=sup | sort > 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=notmuch > BACKUP\r
++\r
++notmuch tag +"$tag1" +"$tag2" +"$tag3" -inbox -unread "*"\r
++\r
++test_begin_subtest 'format=notmuch, round trip with strange tags'\r
++    notmuch dump --format=notmuch > EXPECTED.$test_count\r
++    notmuch dump --format=notmuch | notmuch restore --format=notmuch\r
++    notmuch dump --format=notmuch > OUTPUT.$test_count\r
++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
++\r
++test_begin_subtest 'format=notmuch, checking encoded output'\r
++    cp /dev/null EXPECTED.$test_count\r
++    notmuch dump --format=notmuch -- from:cworth |\\r
++       awk "{ print \$1 \" $enc1 $enc2 $enc3\" }" > EXPECTED.$test_count\r
++\r
++    notmuch dump --format=notmuch -- 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=notmuch < BACKUP\r
++    notmuch dump --format=notmuch > OUTPUT.$test_count\r
++test_expect_equal_file BACKUP OUTPUT.$test_count\r
++\r
++test_begin_subtest 'format=notmuch, restore=auto'\r
++    notmuch dump --format=notmuch > EXPECTED.$test_count\r
++    notmuch tag -inbox -unread "*"\r
++    notmuch restore --format=auto < EXPECTED.$test_count\r
++    notmuch dump --format=notmuch > 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=notmuch, restore=default'\r
++    notmuch dump --format=notmuch > EXPECTED.$test_count\r
++    notmuch tag -inbox -unread "*"\r
++    notmuch restore < EXPECTED.$test_count\r
++    notmuch dump --format=notmuch > 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_done\r
+-- \r
+1.7.7.3\r
+\r