[PATCH] test: fix syntax errors in erroring calls to notmuch insert

[PATCH] test: fix syntax errors in erroring calls to notmuch insert

[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

Re: [PATCH] test: fix syntax errors in erroring calls to notmuch insert

[Tomi Ollila]

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

Re: [PATCH] test: fix syntax errors in erroring calls to notmuch insert

[David Bremner]

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