From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id F2DD5404511 for ; Sat, 14 Jan 2012 17:40:46 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] 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 qVV1Rjvmn7QZ for ; Sat, 14 Jan 2012 17:40:46 -0800 (PST) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id D8185414391 for ; Sat, 14 Jan 2012 17:40:45 -0800 (PST) Received: from zancas.localnet (fctnnbsc36w-156034076032.pppoe-dynamic.High-Speed.nb.bellaliant.net [156.34.76.32]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q0F1efsu008573 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Sat, 14 Jan 2012 21:40:44 -0400 Received: from bremner by zancas.localnet with local (Exim 4.77) (envelope-from ) id 1RmF5N-00042y-IJ; Sat, 14 Jan 2012 21:40:41 -0400 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH v3 07/10] test: second set of dump/restore --format=notmuch tests Date: Sat, 14 Jan 2012 21:40:21 -0400 Message-Id: <1326591624-15493-8-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1326591624-15493-1-git-send-email-david@tethera.net> References: <874nwxbkhr.fsf@zancas.localnet> <1326591624-15493-1-git-send-email-david@tethera.net> 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, 15 Jan 2012 01:40:47 -0000 From: David Bremner These one need the completed functionality in notmuch-restore. Fairly exotic tags are tested, but no weird message id's. We test each possible input to autodetection, both explicit (with --format=auto) and implicit (without --format). --- test/dump-restore | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/test/dump-restore b/test/dump-restore index 0e210d3..60ae68e 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -94,4 +94,70 @@ notmuch dump --format=sup -- from:cworth | tr -d \(\) > EXPECTED.$test_count notmuch dump --format=notmuch -- from:cworth > OUTPUT.$test_count test_expect_equal_file OUTPUT.$test_count EXPECTED.$test_count +test_begin_subtest "format=notmuch, # round-trip" +notmuch dump --format=sup | sort > EXPECTED.$test_count +notmuch dump --format=notmuch | notmuch restore --format=notmuch +notmuch dump --format=sup | sort > OUTPUT.$test_count +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count + +tag1='comic_swear=$&^%$^%\\//-+$^%$' +enc1=$($TEST_DIRECTORY/hex-xcode --direction=encode "$tag1") + +tag2=$(printf 'this\n tag\t has\n spaces') +enc2=$($TEST_DIRECTORY/hex-xcode --direction=encode "$tag2") + +enc3='%c3%91%c3%a5%c3%b0%c3%a3%c3%a5%c3%a9-%c3%8f%c3%8a' +tag3=$($TEST_DIRECTORY/hex-xcode --direction=decode $enc3) + +notmuch dump --format=notmuch > BACKUP + +notmuch tag +"$tag1" +"$tag2" +"$tag3" -inbox -unread "*" + +test_begin_subtest 'format=notmuch, round trip with strange tags' + notmuch dump --format=notmuch > EXPECTED.$test_count + notmuch dump --format=notmuch | notmuch restore --format=notmuch + notmuch dump --format=notmuch > OUTPUT.$test_count +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count + +test_begin_subtest 'format=notmuch, checking encoded output' + cp /dev/null EXPECTED.$test_count + notmuch dump --format=notmuch -- from:cworth |\ + awk "{ print \$1 \" $enc1 $enc2 $enc3\" }" > EXPECTED.$test_count + + notmuch dump --format=notmuch -- from:cworth > OUTPUT.$test_count +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count + +test_begin_subtest 'restoring sane tags' + notmuch restore --format=notmuch < BACKUP + notmuch dump --format=notmuch > OUTPUT.$test_count +test_expect_equal_file BACKUP OUTPUT.$test_count + +test_begin_subtest 'format=notmuch, restore=auto' + notmuch dump --format=notmuch > EXPECTED.$test_count + notmuch tag -inbox -unread "*" + notmuch restore --format=auto < EXPECTED.$test_count + notmuch dump --format=notmuch > OUTPUT.$test_count +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count + +test_begin_subtest 'format=sup, restore=auto' + notmuch dump --format=sup > EXPECTED.$test_count + notmuch tag -inbox -unread "*" + notmuch restore --format=auto < EXPECTED.$test_count + notmuch dump --format=sup > OUTPUT.$test_count +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count + +test_begin_subtest 'format=notmuch, restore=default' + notmuch dump --format=notmuch > EXPECTED.$test_count + notmuch tag -inbox -unread "*" + notmuch restore < EXPECTED.$test_count + notmuch dump --format=notmuch > OUTPUT.$test_count +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count + +test_begin_subtest 'format=sup, restore=default' + notmuch dump --format=sup > EXPECTED.$test_count + notmuch tag -inbox -unread "*" + notmuch restore < EXPECTED.$test_count + notmuch dump --format=sup > OUTPUT.$test_count +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count + test_done -- 1.7.7.3