From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org, Rob Browning <rlb@defaultvalue.org>
Subject: [PATCH 3/3] test: add tests for invalid new.tags
Date: Sun, 23 Feb 2014 18:55:23 +0200 [thread overview]
Message-ID: <ca31c06691e8b922bac90560733aef735525a1ed.1393174108.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1393174108.git.jani@nikula.org>
In-Reply-To: <cover.1393174108.git.jani@nikula.org>
Similar tests for both notmuch new and insert.
---
test/T050-new.sh | 17 +++++++++++++++++
test/T070-insert.sh | 19 +++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/test/T050-new.sh b/test/T050-new.sh
index b7668ff0c4bc..ad46ee6d51b6 100755
--- a/test/T050-new.sh
+++ b/test/T050-new.sh
@@ -263,4 +263,21 @@ notmuch search --format=text0 --output=files --offset=1 --limit=1 '*' | xargs -0
output=$(NOTMUCH_NEW --quiet)
test_expect_equal "$output" ""
+OLDCONFIG=$(notmuch config get new.tags)
+
+test_begin_subtest "Empty tags in new.tags are forbidden"
+notmuch config set new.tags "foo;;bar"
+output=$(NOTMUCH_NEW 2>&1)
+test_expect_equal "$output" "Error: tag '' in new.tags: empty tag forbidden"
+
+test_begin_subtest "Tags starting with '-' in new.tags are forbidden"
+notmuch config set new.tags "-foo;bar"
+output=$(NOTMUCH_NEW 2>&1)
+test_expect_equal "$output" "Error: tag '-foo' in new.tags: tag starting with '-' forbidden"
+
+test_expect_code 1 "Invalid tags set exit code" \
+ "NOTMUCH_NEW 2>&1"
+
+notmuch config set new.tags $OLDCONFIG
+
test_done
diff --git a/test/T070-insert.sh b/test/T070-insert.sh
index e8dc4c099ed1..b77c5e13c87f 100755
--- a/test/T070-insert.sh
+++ b/test/T070-insert.sh
@@ -164,4 +164,23 @@ gen_insert_msg
test_expect_code 1 "Insert message, create invalid subfolder" \
"notmuch insert --folder=../G --create-folder $gen_msg_filename"
+OLDCONFIG=$(notmuch config get new.tags)
+
+test_begin_subtest "Empty tags in new.tags are forbidden"
+notmuch config set new.tags "foo;;bar"
+gen_insert_msg
+output=$(notmuch insert $gen_msg_filename 2>&1)
+test_expect_equal "$output" "Error: tag '' in new.tags: empty tag forbidden"
+
+test_begin_subtest "Tags starting with '-' in new.tags are forbidden"
+notmuch config set new.tags "-foo;bar"
+gen_insert_msg
+output=$(notmuch insert $gen_msg_filename 2>&1)
+test_expect_equal "$output" "Error: tag '-foo' in new.tags: tag starting with '-' forbidden"
+
+test_expect_code 1 "Invalid tags set exit code" \
+ "notmuch insert $gen_msg_filename 2>&1"
+
+notmuch config set new.tags $OLDCONFIG
+
test_done
--
1.8.5.3
next prev parent reply other threads:[~2014-02-23 16:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-23 2:29 [BUG] Putting "tags=;" into .notmuch-config will create empty tags Rob Browning
2014-02-23 16:55 ` [PATCH 0/3] check new.tags for invalid tags Jani Nikula
2014-02-23 16:55 ` [PATCH 1/3] cli: export function for illegal tag checking Jani Nikula
2014-02-23 16:55 ` [PATCH 2/3] cli: make sure notmuch new and insert don't add invalid tags Jani Nikula
2014-02-23 16:55 ` Jani Nikula [this message]
2014-02-23 18:21 ` [PATCH 0/3] check new.tags for " Tomi Ollila
2014-03-04 16:51 ` [PATCH] cli: add missing \n in error message Jani Nikula
2014-03-06 11:51 ` [PATCH 0/3] check new.tags for invalid tags David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ca31c06691e8b922bac90560733aef735525a1ed.1393174108.git.jani@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
--cc=rlb@defaultvalue.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).