debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test/path-config: use test_expect_equal_file_nonempty

Browse source 
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.
This commit is contained in:
David Bremner 2021-08-04 07:42:33 -03:00
parent 474a7f8e65
commit 4f84c01b3a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/T055-path-config.sh
View file

@ -157,13 +157,13 @@ EOF
notmuch tag -inbox '*' notmuch tag -inbox '*'
notmuch restore < EXPECTED notmuch restore < EXPECTED
notmuch dump > OUTPUT notmuch dump > OUTPUT
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file_nonempty EXPECTED OUTPUT
test_begin_subtest "reindex ($config)" test_begin_subtest "reindex ($config)"
notmuch search --output=messages '*' > EXPECTED notmuch search --output=messages '*' > EXPECTED
notmuch reindex '*' notmuch reindex '*'
notmuch search --output=messages '*' > OUTPUT 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)" test_begin_subtest "use existing database ($config)"
output=$(notmuch new) output=$(notmuch new)
@ -185,7 +185,7 @@ EOF
test_begin_subtest "Show a raw message ($config)" test_begin_subtest "Show a raw message ($config)"
add_message add_message
notmuch show --format=raw id:$gen_msg_id > OUTPUT 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 rm -f $gen_msg_filename
test_begin_subtest "reply ($config)" test_begin_subtest "reply ($config)"
@ -215,14 +215,13 @@ EOF
mkdir -p "$MAIL_DIR"/{cur,new,tmp} mkdir -p "$MAIL_DIR"/{cur,new,tmp}
notmuch insert < "$gen_msg_filename" notmuch insert < "$gen_msg_filename"
cur_msg_filename=$(notmuch search --output=files "subject:insert-subject") 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)" test_begin_subtest "compact+search ($config)"
notmuch search --output=messages '*' | sort > EXPECTED notmuch search --output=messages '*' | sort > EXPECTED
notmuch compact notmuch compact
notmuch search --output=messages '*' | sort > OUTPUT 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)" test_begin_subtest "upgrade backup ($config)"
features=$(xapian-metadata get $XAPIAN_PATH features | grep -v "^relative directory paths") features=$(xapian-metadata get $XAPIAN_PATH features | grep -v "^relative directory paths")