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 B3448431FAF for ; Sat, 24 Nov 2012 15:17:13 -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 aepCCQpYIGQR for ; Sat, 24 Nov 2012 15:17:13 -0800 (PST) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id 19526431FAE for ; Sat, 24 Nov 2012 15:17:13 -0800 (PST) Received: from guru.guru-group.fi (localhost [IPv6:::1]) by guru.guru-group.fi (Postfix) with ESMTP id 6921210010B; Sun, 25 Nov 2012 01:17:11 +0200 (EET) From: Tomi Ollila To: david@tethera.net, notmuch@notmuchmail.org Subject: Re: [Patch v2 14/17] test: update dump-restore roundtripping test for batch-tag format In-Reply-To: <1353792017-31459-15-git-send-email-david@tethera.net> References: <1353792017-31459-1-git-send-email-david@tethera.net> <1353792017-31459-15-git-send-email-david@tethera.net> User-Agent: Notmuch/0.14+84~g8a199bf (http://notmuchmail.org) Emacs/24.2.1 (x86_64-unknown-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 Content-Type: text/plain 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, 24 Nov 2012 23:17:13 -0000 On Sat, Nov 24 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 | 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 In most cases there is empty line before `test_done` -- also other unrelated whitespace changes disturb review (especially when one is tired ;) > + > +# Note the database is "poisoned" for sup format at this point. > -- > 1.7.10.4 Tomi