From b623dbea494bc96fee365cf6b2b096217de57ae8 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 19 Nov 2012 15:04:55 +2000 Subject: [PATCH] [PATCH 13/16] test: second set of dump/restore --format=batch-tag tests --- 59/154b27fb569d8ad20cb41742bbdda4cd81092f | 153 ++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 59/154b27fb569d8ad20cb41742bbdda4cd81092f diff --git a/59/154b27fb569d8ad20cb41742bbdda4cd81092f b/59/154b27fb569d8ad20cb41742bbdda4cd81092f new file mode 100644 index 000000000..325938b58 --- /dev/null +++ b/59/154b27fb569d8ad20cb41742bbdda4cd81092f @@ -0,0 +1,153 @@ +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 1B33E431FBF + for ; Sun, 18 Nov 2012 11:05:36 -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 6KG9EgqPE4zO for ; + Sun, 18 Nov 2012 11:05:34 -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 A662A431FDE + 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-00028D-Th; Sun, 18 Nov 2012 15:05:19 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TaAB7-0001JA-FG; Sun, 18 Nov 2012 15:05:13 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH 13/16] test: second set of dump/restore --format=batch-tag + tests +Date: Sun, 18 Nov 2012 15:04:55 -0400 +Message-Id: <1353265498-3839-14-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:36 -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 | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 73 insertions(+) + +diff --git a/test/dump-restore b/test/dump-restore +index e08b656..7b67d03 100755 +--- a/test/dump-restore ++++ b/test/dump-restore +@@ -85,6 +85,79 @@ 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_begin_subtest "Check for a safe set of message-ids" ++notmuch search --output=messages from:cworth > EXPECTED.$test_count ++notmuch search --output=messages from:cworth |\ ++ $TEST_DIRECTORY/hex-xcode --direction=encode > OUTPUT.$test_count ++test_expect_equal_file OUTPUT.$test_count EXPECTED.$test_count ++ ++test_begin_subtest "format=batch-tag, # round-trip" ++notmuch dump --format=sup | sort > EXPECTED.$test_count ++notmuch dump --format=batch-tag | notmuch restore --format=batch-tag ++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=batch-tag > BACKUP ++ ++notmuch tag +"$tag1" +"$tag2" +"$tag3" -inbox -unread "*" ++ ++test_begin_subtest 'format=batch-tag, round trip with strange tags' ++ notmuch dump --format=batch-tag > EXPECTED.$test_count ++ notmuch dump --format=batch-tag | notmuch restore --format=batch-tag ++ notmuch dump --format=batch-tag > OUTPUT.$test_count ++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count ++ ++test_begin_subtest 'format=batch-tag, checking encoded output' ++ cp /dev/null EXPECTED.$test_count ++ notmuch dump --format=batch-tag -- from:cworth |\ ++ awk "{ print \"+$enc1 +$enc2 +$enc3 -- \" \$5 }" > EXPECTED.$test_count ++ ++ notmuch dump --format=batch-tag -- from:cworth > OUTPUT.$test_count ++test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count ++ ++test_begin_subtest 'restoring sane tags' ++ notmuch restore --format=batch-tag < BACKUP ++ notmuch dump --format=batch-tag > OUTPUT.$test_count ++test_expect_equal_file BACKUP OUTPUT.$test_count ++ ++test_begin_subtest 'format=batch-tag, restore=auto' ++ notmuch dump --format=batch-tag > EXPECTED.$test_count ++ notmuch tag -inbox -unread "*" ++ notmuch restore --format=auto < EXPECTED.$test_count ++ notmuch dump --format=batch-tag > 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=batch-tag, restore=default' ++ notmuch dump --format=batch-tag > EXPECTED.$test_count ++ notmuch tag -inbox -unread "*" ++ notmuch restore < EXPECTED.$test_count ++ notmuch dump --format=batch-tag > 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 ++ ++notmuch dump --format=batch-tag --output=save.tags + + test_expect_success 'roundtripping random message-ids and tags' \ + '${TEST_DIRECTORY}/random-corpus --num-messages=100 --config-path=${NOTMUCH_CONFIG} && +-- +1.7.10.4 + -- 2.26.2