From acbf52fed90a0a49a5f06ea776b44863888a5b45 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 26 Dec 2012 15:42:41 +2000 Subject: [PATCH] [PATCH 05/11] test/tagging: add test for error messages of tag --batch --- 42/f637d531eac2d173847386c8b78856155c5e8f | 113 ++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 42/f637d531eac2d173847386c8b78856155c5e8f diff --git a/42/f637d531eac2d173847386c8b78856155c5e8f b/42/f637d531eac2d173847386c8b78856155c5e8f new file mode 100644 index 000000000..d4154705b --- /dev/null +++ b/42/f637d531eac2d173847386c8b78856155c5e8f @@ -0,0 +1,113 @@ +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 69745431FB6 + for ; Tue, 25 Dec 2012 11:43:21 -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 yqKzO9SVqseG for ; + Tue, 25 Dec 2012 11:43:20 -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 3F40C431FC3 + for ; Tue, 25 Dec 2012 11:43:11 -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 1TnaP8-0001iH-77; Tue, 25 Dec 2012 15:43:10 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TnaP2-0005nI-Mu; Tue, 25 Dec 2012 15:43:04 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH 05/11] test/tagging: add test for error messages of tag + --batch +Date: Tue, 25 Dec 2012 15:42:41 -0400 +Message-Id: <1356464567-21779-6-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1356464567-21779-1-git-send-email-david@tethera.net> +References: <1356464567-21779-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: Tue, 25 Dec 2012 19:43:21 -0000 + +From: David Bremner + +This is based on the similar test for notmuch restore, but the parser +in batch tagging mode is less tolerant of a few cases, in particular +those tested by illegal_tag. +--- + test/tagging | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +diff --git a/test/tagging b/test/tagging +index 980ff92..cd16585 100755 +--- a/test/tagging ++++ b/test/tagging +@@ -46,6 +46,41 @@ test_expect_equal "$output" "\ + thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (:\" inbox tag1 unread) + thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag4 unread)" + ++test_begin_subtest '--batch: checking error messages' ++notmuch dump --format=batch-tag > BACKUP ++notmuch tag --batch <OUTPUT ++# the next line has a space ++ ++# this line has no tag operations, but this is permitted in batch format. ++a +++0 +++a +b ++# trailing whitespace +++a +b +++c +d -- ++# this is a harmless comment, do not yell about it. ++ ++# the previous line was blank; also no yelling please +++%zz -- id:whatever ++# the next non-comment line should report an an empty tag error for ++# batch tagging, but not for restore +++ +e -- id:foo +++- -- id:foo ++EOF ++ ++cat < EXPECTED ++Warning: no query string [+0] ++Warning: no query string [+a +b] ++Warning: missing query string [+a +b ] ++Warning: no query string after -- [+c +d --] ++Warning: hex decoding of tag %zz failed [+%zz -- id:whatever] ++Warning: empty tag forbidden [+ +e -- id:foo] ++Warning: tag starting with '-' forbidden [+- -- id:foo] ++EOF ++ ++notmuch restore --format=batch-tag < BACKUP ++test_expect_equal_file EXPECTED OUTPUT ++ + test_expect_code 1 "Empty tag names" 'notmuch tag + One' + + test_expect_code 1 "Tag name beginning with -" 'notmuch tag +- One' +-- +1.7.10.4 + -- 2.26.2