Re: [PATCH 4/7] test/path-config: use test_expect_equal_file_nonempty

2021-08-21 Thread Tomi Ollila
On Wed, Aug 04 2021, David Bremner wrote:

> This is more robust against crashes when the expected output is also
> generated by notmuch. In the case where the expected output is
> explicit, it seems like overkill.

1,2,3 and 4 in this series look good to me

Tomi (on mobile device)



> ---
>  test/T055-path-config.sh | 11 +--
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
> index bb3bf665..8271579f 100755
> --- a/test/T055-path-config.sh
> +++ b/test/T055-path-config.sh
> @@ -141,13 +141,13 @@ EOF
>  notmuch tag -inbox '*'
>  notmuch restore < EXPECTED
>  notmuch dump > OUTPUT
> -test_expect_equal_file EXPECTED OUTPUT
> +test_expect_equal_file_nonempty EXPECTED OUTPUT
>  
>  test_begin_subtest "reindex ($config)"
>  notmuch search --output=messages '*' > EXPECTED
>  notmuch reindex '*'
>  notmuch search --output=messages '*' > OUTPUT
> -test_expect_equal_file EXPECTED OUTPUT
> +test_expect_equal_file_nonempty EXPECTED OUTPUT
>  
>  test_begin_subtest "use existing database ($config)"
>  output=$(notmuch new)
> @@ -169,7 +169,7 @@ EOF
>  test_begin_subtest "Show a raw message ($config)"
>  add_message
>  notmuch show --format=raw id:$gen_msg_id > OUTPUT
> -test_expect_equal_file $gen_msg_filename OUTPUT
> +test_expect_equal_file_nonempty $gen_msg_filename OUTPUT
>  rm -f $gen_msg_filename
>  
>  test_begin_subtest "reply ($config)"
> @@ -198,14 +198,13 @@ EOF
>  mkdir -p "$MAIL_DIR"/{cur,new,tmp}
>  notmuch insert < "$gen_msg_filename"
>  cur_msg_filename=$(notmuch search --output=files 
> "subject:insert-subject")
> -test_expect_equal_file "$cur_msg_filename" "$gen_msg_filename"
> -
> +test_expect_equal_file_nonempty "$cur_msg_filename" "$gen_msg_filename"
>  
>  test_begin_subtest "compact+search ($config)"
>  notmuch search --output=messages '*' | sort > EXPECTED
>  notmuch compact
>  notmuch search --output=messages '*' | sort > OUTPUT
> -test_expect_equal_file EXPECTED OUTPUT
> +test_expect_equal_file_nonempty EXPECTED OUTPUT
>  
>  test_begin_subtest "upgrade backup ($config)"
>  features=$(xapian-metadata get $XAPIAN_PATH features | grep -v 
> "^relative directory paths")
> -- 
> 2.30.2
> ___
> notmuch mailing list -- notmuch@notmuchmail.org
> To unsubscribe send an email to notmuch-le...@notmuchmail.org
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


[PATCH 4/7] test/path-config: use test_expect_equal_file_nonempty

2021-08-04 Thread David Bremner
This is more robust against crashes when the expected output is also
generated by notmuch. In the case where the expected output is
explicit, it seems like overkill.
---
 test/T055-path-config.sh | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index bb3bf665..8271579f 100755
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -141,13 +141,13 @@ EOF
 notmuch tag -inbox '*'
 notmuch restore < EXPECTED
 notmuch dump > OUTPUT
-test_expect_equal_file EXPECTED OUTPUT
+test_expect_equal_file_nonempty EXPECTED OUTPUT
 
 test_begin_subtest "reindex ($config)"
 notmuch search --output=messages '*' > EXPECTED
 notmuch reindex '*'
 notmuch search --output=messages '*' > OUTPUT
-test_expect_equal_file EXPECTED OUTPUT
+test_expect_equal_file_nonempty EXPECTED OUTPUT
 
 test_begin_subtest "use existing database ($config)"
 output=$(notmuch new)
@@ -169,7 +169,7 @@ EOF
 test_begin_subtest "Show a raw message ($config)"
 add_message
 notmuch show --format=raw id:$gen_msg_id > OUTPUT
-test_expect_equal_file $gen_msg_filename OUTPUT
+test_expect_equal_file_nonempty $gen_msg_filename OUTPUT
 rm -f $gen_msg_filename
 
 test_begin_subtest "reply ($config)"
@@ -198,14 +198,13 @@ EOF
 mkdir -p "$MAIL_DIR"/{cur,new,tmp}
 notmuch insert < "$gen_msg_filename"
 cur_msg_filename=$(notmuch search --output=files "subject:insert-subject")
-test_expect_equal_file "$cur_msg_filename" "$gen_msg_filename"
-
+test_expect_equal_file_nonempty "$cur_msg_filename" "$gen_msg_filename"
 
 test_begin_subtest "compact+search ($config)"
 notmuch search --output=messages '*' | sort > EXPECTED
 notmuch compact
 notmuch search --output=messages '*' | sort > OUTPUT
-test_expect_equal_file EXPECTED OUTPUT
+test_expect_equal_file_nonempty EXPECTED OUTPUT
 
 test_begin_subtest "upgrade backup ($config)"
 features=$(xapian-metadata get $XAPIAN_PATH features | grep -v "^relative 
directory paths")
-- 
2.30.2
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org