unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / Atom feed
* [PATCH] test: fix syntax errors in erroring calls to notmuch insert
@ 2020-09-04  1:10 David Bremner
  2020-09-04  5:34 ` Tomi Ollila
  2020-09-05  0:05 ` David Bremner
  0 siblings, 2 replies; 3+ messages in thread
From: David Bremner @ 2020-09-04  1:10 UTC (permalink / raw)
  To: notmuch; +Cc: David Bremner

notmuch insert does not currently support passing a filename for the
input, so all of these tests have an extra error in addition to the
one being tested for.

Currently this does not make a difference because the error being
tested for is caught before the error of an extra command line
argument. In the future it might make a difference, and in any case it
is confusing.
---
 test/T070-insert.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/T070-insert.sh b/test/T070-insert.sh
index c8161e1e..1c7ca846 100755
--- a/test/T070-insert.sh
+++ b/test/T070-insert.sh
@@ -222,24 +222,24 @@ test_expect_equal "$output" "2"
 
 test_begin_subtest "Insert message, create invalid subfolder"
 gen_insert_msg
-test_expect_code 1 "notmuch insert --folder=../G --create-folder $gen_msg_filename"
+test_expect_code 1 "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)
+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)
+output=$(notmuch insert < $gen_msg_filename 2>&1)
 test_expect_equal "$output" "Error: tag '-foo' in new.tags: tag starting with '-' forbidden"
 
 test_begin_subtest "Invalid tags set exit code"
-test_expect_code 1 "notmuch insert $gen_msg_filename 2>&1"
+test_expect_code 1 "notmuch insert < $gen_msg_filename 2>&1"
 
 notmuch config set new.tags $OLDCONFIG
 
-- 
2.28.0

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] test: fix syntax errors in erroring calls to notmuch insert
  2020-09-04  1:10 [PATCH] test: fix syntax errors in erroring calls to notmuch insert David Bremner
@ 2020-09-04  5:34 ` Tomi Ollila
  2020-09-05  0:05 ` David Bremner
  1 sibling, 0 replies; 3+ messages in thread
From: Tomi Ollila @ 2020-09-04  5:34 UTC (permalink / raw)
  To: David Bremner, notmuch; +Cc: David Bremner

On Thu, Sep 03 2020, David Bremner wrote:

> notmuch insert does not currently support passing a filename for the
> input, so all of these tests have an extra error in addition to the
> one being tested for.
>
> Currently this does not make a difference because the error being
> tested for is caught before the error of an extra command line
> argument. In the future it might make a difference, and in any case it
> is confusing.

LGTM.

Tomi

> ---
>  test/T070-insert.sh | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/test/T070-insert.sh b/test/T070-insert.sh
> index c8161e1e..1c7ca846 100755
> --- a/test/T070-insert.sh
> +++ b/test/T070-insert.sh
> @@ -222,24 +222,24 @@ test_expect_equal "$output" "2"
>  
>  test_begin_subtest "Insert message, create invalid subfolder"
>  gen_insert_msg
> -test_expect_code 1 "notmuch insert --folder=../G --create-folder $gen_msg_filename"
> +test_expect_code 1 "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)
> +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)
> +output=$(notmuch insert < $gen_msg_filename 2>&1)
>  test_expect_equal "$output" "Error: tag '-foo' in new.tags: tag starting with '-' forbidden"
>  
>  test_begin_subtest "Invalid tags set exit code"
> -test_expect_code 1 "notmuch insert $gen_msg_filename 2>&1"
> +test_expect_code 1 "notmuch insert < $gen_msg_filename 2>&1"
>  
>  notmuch config set new.tags $OLDCONFIG
>  
> -- 
> 2.28.0

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] test: fix syntax errors in erroring calls to notmuch insert
  2020-09-04  1:10 [PATCH] test: fix syntax errors in erroring calls to notmuch insert David Bremner
  2020-09-04  5:34 ` Tomi Ollila
@ 2020-09-05  0:05 ` David Bremner
  1 sibling, 0 replies; 3+ messages in thread
From: David Bremner @ 2020-09-05  0:05 UTC (permalink / raw)
  To: notmuch

David Bremner <david@tethera.net> writes:

> notmuch insert does not currently support passing a filename for the
> input, so all of these tests have an extra error in addition to the
> one being tested for.
>

applied to master

d

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-09-05  0:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-04  1:10 [PATCH] test: fix syntax errors in erroring calls to notmuch insert David Bremner
2020-09-04  5:34 ` Tomi Ollila
2020-09-05  0:05 ` David Bremner

unofficial mirror of notmuch@notmuchmail.org

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/notmuch/0 notmuch/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 notmuch notmuch/ https://yhetil.org/notmuch \
		notmuch@notmuchmail.org
	public-inbox-index notmuch

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.yhetil.org/yhetil.mail.notmuch.general
	nntp://news.gmane.io/gmane.mail.notmuch.general


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git