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 +++++------ test/test-lib.sh | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh index 2061b116..035276c2 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -151,13 +151,13 @@ EOF notmuch tag -inbox '*' notmuch restore < EXPECTED notmuch dump > OUTPUT - test_expect_equal_file EXPECTED OUTPUT + test_expect_equal_file_nonempty EXPECTED OUTPUT config_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 config_subtest "use existing database" "$config" output=$(notmuch new) @@ -179,7 +179,7 @@ EOF config_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 config_subtest "reply" "$config" @@ -208,14 +208,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" config_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 config_subtest "upgrade backup" "$config" features=$(xapian-metadata get $XAPIAN_PATH features | grep -v "^relative directory paths") diff --git a/test/test-lib.sh b/test/test-lib.sh index 4865032d..94f9d605 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -447,6 +447,7 @@ test_expect_equal_file_nonempty () { for file in "$1" "$2"; do if [ ! -s "$file" ]; then test_failure_ "Missing or zero length file: $file" + return $? fi done -- 2.30.2 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-leave@notmuchmail.org