Re: [Patch v3b 6/9] test: update dump-restore roundtripping test for batch-tag format

diff --git a/15/b1609de6fa56a3e3675799c2aeb5991556d911 b/15/b1609de6fa56a3e3675799c2aeb5991556d911
new file mode 100644 (file)
index 0000000..b118b16
--- /dev/null
+++ b/15/b1609de6fa56a3e3675799c2aeb5991556d911
@@ -0,0 +1,127 @@
+Return-Path: <jani@nikula.org>\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 C37A4431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  7 Dec 2012 14:56:06 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 wdnoQsmUmSVi for <notmuch@notmuchmail.org>;\r
+       Fri,  7 Dec 2012 14:56:06 -0800 (PST)\r
+Received: from mail-la0-f53.google.com (mail-la0-f53.google.com\r
+       [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 16934431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  7 Dec 2012 14:56:05 -0800 (PST)\r
+Received: by mail-la0-f53.google.com with SMTP id w12so753662lag.26\r
+       for <notmuch@notmuchmail.org>; Fri, 07 Dec 2012 14:56:04 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:in-reply-to:references:user-agent:date\r
+       :message-id:mime-version:content-type:x-gm-message-state;\r
+       bh=3NjoijXUq8l8W2qjNw63KUqpiqiY7RzhlaiJDc3N4ik=;\r
+       b=aRtiW0keQfQ2QDY8J2iu4PZvXsj0bHym5oDh36JTxttDTwmTumiJThlOqs+XjYd1Zx\r
+       akh3EOQfHqOsonTyg41V95AvcilcF+ezg9dS10GuYVuQy7at60V+u4og77TunZqoDuR7\r
+       brIvZv+BqupwkGmsyOwpBcwdF3HLBvBzPQXRzlFzPaqnU8LWZzdBYAIgokxsdsvmOp7A\r
+       P5q4RamaVsAy3ni92WYmbcBU+8QcfM9y/LK2L0hFH4K8XmSmjBent3NAJrB/n+owYub1\r
+       ZEUx7oPgDHOx0U9fobgpT87jF3bvmPqM8Q6gepdAT9vBFQT2xE4M1suJpfWY8+5Peslk\r
+       cFKA==\r
+Received: by 10.112.49.65 with SMTP id s1mr3129018lbn.123.1354920964459;\r
+       Fri, 07 Dec 2012 14:56:04 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id fb1sm5164695lbb.15.2012.12.07.14.56.02\r
+       (version=SSLv3 cipher=OTHER); Fri, 07 Dec 2012 14:56:03 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v3b 6/9] test: update dump-restore roundtripping test for\r
+       batch-tag format\r
+In-Reply-To: <1354843607-17980-7-git-send-email-david@tethera.net>\r
+References: <1354843607-17980-1-git-send-email-david@tethera.net>\r
+       <1354843607-17980-7-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+138~g7041c56 (http://notmuchmail.org) Emacs/23.4.1\r
+       (i686-pc-linux-gnu)\r
+Date: Sat, 08 Dec 2012 00:56:01 +0200\r
+Message-ID: <87obi5xyim.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQmkKOFWz/ldtX4rHbLfx7Azz+NTZdSMBbt4CW1Z5MSA2XnI8OL+4nI1qJiVpAtTsKxnP1AI\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: Fri, 07 Dec 2012 22:56:06 -0000\r
+\r
+On Fri, 07 Dec 2012, david@tethera.net wrote:\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 |   17 ++++++++---------\r
+>  1 file changed, 8 insertions(+), 9 deletions(-)\r
+>\r
+> diff --git a/test/dump-restore b/test/dump-restore\r
+> index b4c807f..ce81e6f 100755\r
+> --- a/test/dump-restore\r
+> +++ b/test/dump-restore\r
+> @@ -99,23 +99,22 @@ notmuch dump --format=batch-tag from:cworth | sed 's/^.*-- id://' | \\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
+> -                    --num-messages=10\r
+>  \r
+> -     notmuch dump| \\r
+> -     ${TEST_DIRECTORY}/hex-xcode --direction=encode| \\r
+> +    ${TEST_DIRECTORY}/random-corpus --config-path=${NOTMUCH_CONFIG}\r
+> +                    --num-messages=100\r
+\r
+What happened to the \ at the end of the line? Hmm, does it matter?\r
+\r
+Otherwise, LGTM.\r
+\r
+> +\r
+> +     notmuch dump --format=batch-tag| \\r
+>       sort > EXPECTED.$test_count\r
+>  \r
+>       notmuch tag +this_tag_is_very_unlikely_to_be_random '*'\r
+>  \r
+> -     ${TEST_DIRECTORY}/hex-xcode --direction=decode < EXPECTED.$test_count | \\r
+> -     notmuch restore 2>/dev/null\r
+> +     notmuch restore --format=batch-tag < EXPECTED.$test_count\r
+>  \r
+> -     notmuch dump| \\r
+> -     ${TEST_DIRECTORY}/hex-xcode --direction=encode| \\r
+> +     notmuch dump --format=batch-tag| \\r
+>       sort > OUTPUT.$test_count\r
+>  \r
+>  test_expect_equal_file 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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r