X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=test%2FT020-compact.sh;h=1fecd071e77e07faaf6348beb4df82f82fc7dd30;hb=d0cd253b37646d9364d046e1d3edb022a58c105a;hp=507f769857ddad7ead5912d286008f35c9af979c;hpb=c2d8236b56e713ae2e7053c9ea3cc13f7d1283c4;p=notmuch diff --git a/test/T020-compact.sh b/test/T020-compact.sh index 507f7698..1fecd071 100755 --- a/test/T020-compact.sh +++ b/test/T020-compact.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash test_description='"notmuch compact"' -. ./test-lib.sh +. ./test-lib.sh || exit 1 add_message '[subject]=One' add_message '[subject]=Two' @@ -21,7 +21,8 @@ Compaction failed: Unsupported operation" test_done fi -test_expect_success "Running compact" "notmuch compact --backup=${TEST_DIRECTORY}/xapian.old" +test_begin_subtest "Running compact" +test_expect_success "notmuch compact --backup=${TEST_DIRECTORY}/xapian.old" test_begin_subtest "Compact preserves database" output=$(notmuch search \* | notmuch_search_sanitize) @@ -30,8 +31,8 @@ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread) thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread) thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)" -test_expect_success 'Restoring Backup' \ - 'rm -Rf ${MAIL_DIR}/.notmuch/xapian && +test_begin_subtest "Restoring Backup" +test_expect_success 'rm -Rf ${MAIL_DIR}/.notmuch/xapian && mv ${TEST_DIRECTORY}/xapian.old ${MAIL_DIR}/.notmuch/xapian' test_begin_subtest "Checking restored backup"