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 7DF92431FBF for ; Sun, 18 Nov 2012 11:05:33 -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 MmKozr97Ti1i for ; Sun, 18 Nov 2012 11:05:32 -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 8F513431FDC for ; Sun, 18 Nov 2012 11:05:19 -0800 (PST) Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net ([156.34.89.108] 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 1TaABC-00028C-QY; Sun, 18 Nov 2012 15:05:18 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1TaAB7-0001J5-9Q; Sun, 18 Nov 2012 15:05:13 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH 12/16] test: update dump-restore roundtripping test for batch-tag format. Date: Sun, 18 Nov 2012 15:04:54 -0400 Message-Id: <1353265498-3839-13-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353265498-3839-1-git-send-email-david@tethera.net> References: <1353265498-3839-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: Sun, 18 Nov 2012 19:05:33 -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 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/dump-restore b/test/dump-restore index a2204fb..e08b656 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -85,13 +85,14 @@ test_begin_subtest "dump --output=outfile -- from:cworth" notmuch dump --output=dump-outfile-dash-inbox.actual -- from:cworth test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual + test_expect_success 'roundtripping random message-ids and tags' \ - 'test_subtest_known_broken && - ${TEST_DIRECTORY}/random-corpus --num-messages=10 --config-path=${NOTMUCH_CONFIG} && - notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > EXPECTED.$test_count && + '${TEST_DIRECTORY}/random-corpus --num-messages=100 --config-path=${NOTMUCH_CONFIG} && + notmuch dump --format=batch-tag | sort > EXPECTED.$test_count && notmuch tag -random-corpus tag:random-corpus && - ${TEST_DIRECTORY}/hex-xcode --direction=decode < EXPECTED.$test_count | notmuch restore 2>/dev/null && - notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > OUTPUT.$test_count && + notmuch restore --format=batch-tag --input=EXPECTED.$test_count && + notmuch dump --format=batch-tag | sort > OUTPUT.$test_count && test_cmp EXPECTED.$test_count OUTPUT.$test_count' - test_done + +# Note the database is "poisoned" for sup format at this point. -- 1.7.10.4