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 3C136429E41 for ; Sat, 8 Dec 2012 07:08:24 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] 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 yB1GX50yxkBd for ; Sat, 8 Dec 2012 07:08:23 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 2EC78429E43 for ; Sat, 8 Dec 2012 07:08:15 -0800 (PST) Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net ([142.167.90.129] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1ThM0k-0005dP-5X; Sat, 08 Dec 2012 11:08:14 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1ThM0e-0005H2-MU; Sat, 08 Dec 2012 11:08:08 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [Patch v4 06/10] test: update dump-restore roundtripping test for batch-tag format Date: Sat, 8 Dec 2012 11:07:52 -0400 Message-Id: <1354979276-20099-7-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1354979276-20099-1-git-send-email-david@tethera.net> References: <1354979276-20099-1-git-send-email-david@tethera.net> X-Spam_bar: - 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: Sat, 08 Dec 2012 15:08:25 -0000 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 + + 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