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 25E25431FAF for ; Sat, 24 Nov 2012 17:16:57 -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 Ewp+SfNG8FIX for ; Sat, 24 Nov 2012 17:16:56 -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 A613C431FAE for ; Sat, 24 Nov 2012 17:16:56 -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 1TcQq7-0006fZ-79; Sat, 24 Nov 2012 21:16:55 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1TcQq1-0005jt-Lx; Sat, 24 Nov 2012 21:16:49 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH] test: update dump-restore roundtripping test for batch-tag format Date: Sat, 24 Nov 2012 21:16:48 -0400 Message-Id: <1353806208-21965-1-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: 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, 25 Nov 2012 01:16:57 -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. --- I played with this a bit to try to make the diff nicer; I'm not sure if I really improved much, but putting the sort into the original test was a bug fix anyway. This is really for review; I don't think it will apply without also resending 6/14. test/dump-restore | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/dump-restore b/test/dump-restore index 28474f5..e9ba79d 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -86,18 +86,16 @@ 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 \ + '${TEST_DIRECTORY}/random-corpus --num-messages=100 \ --config-path=${NOTMUCH_CONFIG} && - notmuch dump | - ${TEST_DIRECTORY}/hex-xcode --direction=encode | + 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 | + notmuch restore --format=batch-tag < 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