test/dump-restore: expand test suite for dump-restore, make more robust

Several new tests are added, and existing use of test_begin_subtest is
replaced by test_expect_success to catch failing commands in cases where
we execute more than one command.

Based on changes in

      id:"1317317811-29540-1-git-send-email-thomas@schwinge.name"
This commit is contained in:
David Bremner 2011-10-19 18:03:12 -03:00
parent f4148e9d21
commit c457951344

View file

@ -4,9 +4,31 @@ test_description="\"notmuch dump\" and \"notmuch restore\""
add_email_corpus add_email_corpus
test_expect_success "Dumping all tags" "generate_message && test_expect_success 'Dumping all tags' \
notmuch new && 'generate_message &&
notmuch dump > dump.expected" notmuch new &&
notmuch dump > dump.expected'
test_expect_success 'Clearing all tags' \
'sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected &&
notmuch restore clear.expected &&
notmuch dump > clear.actual &&
test_cmp clear.expected clear.actual'
test_expect_success 'Restoring original tags' \
'notmuch restore dump.expected &&
notmuch dump > dump.actual &&
test_cmp dump.expected dump.actual'
test_expect_success 'Restore with nothing to do' \
'notmuch restore < dump.expected &&
notmuch dump > dump.actual &&
test_cmp dump.expected dump.actual'
# notmuch restore currently only considers the first argument.
test_subtest_known_broken
test_expect_success 'Invalid restore invocation' \
'test_must_fail notmuch restore dump.expected another_one'
test_begin_subtest "dump outfile" test_begin_subtest "dump outfile"
notmuch dump dump-outfile.actual notmuch dump dump-outfile.actual
@ -37,17 +59,4 @@ test_begin_subtest "dump outfile -- from:cworth"
notmuch dump dump-outfile-dash-inbox.actual -- from:cworth notmuch dump dump-outfile-dash-inbox.actual -- from:cworth
test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual
test_begin_subtest "Clearing all tags"
sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected
notmuch restore < clear.expected
notmuch dump > clear.actual
test_expect_equal "$(< clear.actual)" "$(< clear.expected)"
test_begin_subtest "Restoring original tags"
notmuch restore < dump.expected
notmuch dump > dump.actual
test_expect_equal "$(< dump.actual)" "$(< dump.expected)"
test_expect_success "Restore with nothing to do" "notmuch restore dump.expected"
test_done test_done