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