From cd9834218681a6cd2da4d4da0f55bc3088b1c105 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 27 Dec 2012 15:36:32 +2000 Subject: [PATCH] [PATCH 1/2] test/dump-restore: new tests for empty files and leading comments/whitespace. --- 38/71955ad026a84d9df31d2c6f13ef1cb9214a40 | 117 ++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 38/71955ad026a84d9df31d2c6f13ef1cb9214a40 diff --git a/38/71955ad026a84d9df31d2c6f13ef1cb9214a40 b/38/71955ad026a84d9df31d2c6f13ef1cb9214a40 new file mode 100644 index 000000000..a64521006 --- /dev/null +++ b/38/71955ad026a84d9df31d2c6f13ef1cb9214a40 @@ -0,0 +1,117 @@ +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 4B1D2431FAF + for ; Wed, 26 Dec 2012 11:36:54 -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 HPEo3BDpqT31 for ; + Wed, 26 Dec 2012 11:36:53 -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 9E6A3431FAE + for ; Wed, 26 Dec 2012 11:36:53 -0800 (PST) +Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.82.78] 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 1TnwmX-0002oo-KX; Wed, 26 Dec 2012 15:36:50 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TnwmS-0005eJ-3I; Wed, 26 Dec 2012 15:36:44 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH 1/2] test/dump-restore: new tests for empty files and leading + comments/whitespace. +Date: Wed, 26 Dec 2012 15:36:32 -0400 +Message-Id: <1356550593-21683-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +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: Wed, 26 Dec 2012 19:36:54 -0000 + +From: David Bremner + +Three of these are marked broken; the third is a regression test, +since it passes by virtue of batch-tag being the default input format. +--- + test/dump-restore | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +diff --git a/test/dump-restore b/test/dump-restore +index 6a989b6..c2ddb92 100755 +--- a/test/dump-restore ++++ b/test/dump-restore +@@ -136,6 +136,48 @@ notmuch dump --format=batch-tag > BACKUP + + notmuch tag +"$tag1" +"$tag2" +"$tag3" -inbox -unread "*" + ++# initial segment of file used for several tests below. ++cat < comments-and-blanks ++# this is a comment ++ ++# next line has leading whitespace ++ ++ ++EOF ++ ++test_begin_subtest 'restoring empty file is not an error' ++test_subtest_known_broken ++notmuch restore < /dev/null 2>OUTPUT.$test_count ++cp /dev/null EXPECTED ++test_expect_equal_file EXPECTED OUTPUT.$test_count ++ ++test_begin_subtest 'file of comments and blank lines is not an error' ++test_subtest_known_broken ++notmuch restore --input=comments-and-blanks ++ret_val=$? ++test_expect_equal "$ret_val" "0" ++ ++cp comments-and-blanks leading-comments-blanks-batch-tag ++echo "+some_tag -- id:yun1vjwegii.fsf@aiko.keithp.com" \ ++ >> leading-comments-blanks-batch-tag ++ ++test_begin_subtest 'detect format=batch-tag with leading comments and blanks' ++notmuch restore --input=leading-comments-blanks-batch-tag ++notmuch search --output=tags id:yun1vjwegii.fsf@aiko.keithp.com > OUTPUT.$test_count ++echo "some_tag" > EXPECTED ++test_expect_equal_file EXPECTED OUTPUT.$test_count ++ ++cp comments-and-blanks leading-comments-blanks-sup ++echo "yun1vjwegii.fsf@aiko.keithp.com (another_tag)" \ ++ >> leading-comments-blanks-sup ++ ++test_begin_subtest 'detect format=sup with leading comments and blanks' ++test_subtest_known_broken ++notmuch restore --input=leading-comments-blanks-sup ++notmuch search --output=tags id:yun1vjwegii.fsf@aiko.keithp.com > OUTPUT.$test_count ++echo "another_tag" > EXPECTED ++test_expect_equal_file EXPECTED OUTPUT.$test_count ++ + 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 +-- +1.7.10.4 + -- 2.26.2