Re: [Patch v2 14/17] test: update dump-restore roundtripping test for batch-tag format

diff --git a/44/8c43fa9cf462ff3638606fd79e08cbbf155491 b/44/8c43fa9cf462ff3638606fd79e08cbbf155491
new file mode 100644 (file)
index 0000000..94a3df7
--- /dev/null
+++ b/44/8c43fa9cf462ff3638606fd79e08cbbf155491
@@ -0,0 +1,97 @@
+Return-Path: <tomi.ollila@iki.fi>\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 B3448431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 15:17:13 -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 aepCCQpYIGQR for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 15:17:13 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 19526431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 15:17:13 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 6921210010B;\r
+       Sun, 25 Nov 2012 01:17:11 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v2 14/17] test: update dump-restore roundtripping test for\r
+       batch-tag format\r
+In-Reply-To: <1353792017-31459-15-git-send-email-david@tethera.net>\r
+References: <1353792017-31459-1-git-send-email-david@tethera.net>\r
+       <1353792017-31459-15-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+84~g8a199bf (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 25 Nov 2012 01:17:11 +0200\r
+Message-ID: <m2zk26ioaw.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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, 24 Nov 2012 23:17:13 -0000\r
+\r
+On Sat, Nov 24 2012, david@tethera.net wrote:\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
+>  test/dump-restore |   13 +++++++------\r
+>  1 file changed, 7 insertions(+), 6 deletions(-)\r
+>\r
+> diff --git a/test/dump-restore b/test/dump-restore\r
+> index a2204fb..e08b656 100755\r
+> --- a/test/dump-restore\r
+> +++ b/test/dump-restore\r
+> @@ -85,13 +85,14 @@ 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
+> +\r
+>  test_expect_success 'roundtripping random message-ids and tags' \\r
+> -    'test_subtest_known_broken &&\r
+> -     ${TEST_DIRECTORY}/random-corpus --num-messages=10 --config-path=${NOTMUCH_CONFIG} &&\r
+> -     notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > EXPECTED.$test_count &&\r
+> +    '${TEST_DIRECTORY}/random-corpus --num-messages=100 --config-path=${NOTMUCH_CONFIG} &&\r
+> +     notmuch dump --format=batch-tag | sort > EXPECTED.$test_count &&\r
+>       notmuch tag -random-corpus tag:random-corpus &&\r
+> -     ${TEST_DIRECTORY}/hex-xcode --direction=decode < EXPECTED.$test_count | notmuch restore 2>/dev/null &&\r
+> -     notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > OUTPUT.$test_count &&\r
+> +     notmuch restore --format=batch-tag --input=EXPECTED.$test_count &&\r
+> +     notmuch dump --format=batch-tag | sort > OUTPUT.$test_count &&\r
+>       test_cmp EXPECTED.$test_count OUTPUT.$test_count'\r
+> -\r
+>  test_done\r
+\r
+In most cases there is empty line before `test_done` -- also other \r
+unrelated whitespace changes disturb review (especially when one is\r
+tired ;)\r
+\r
+> +\r
+> +# Note the database is "poisoned" for sup format at this point.\r
+> -- \r
+> 1.7.10.4\r
+\r
+Tomi\r