X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FT020-compact.sh;h=a3d7380e81c8c12f1a685ca1f4e61cac292ea63c;hb=4a085a51376d888185e6719c397832173a4ba159;hp=8b4dbbc481891e9cec748fa35cf9d5c6a1e0f029;hpb=33c8777a967ece2dd4bbda7e83a4e07c195abf51;p=notmuch diff --git a/test/T020-compact.sh b/test/T020-compact.sh index 8b4dbbc4..a3d7380e 100755 --- a/test/T020-compact.sh +++ b/test/T020-compact.sh @@ -16,12 +16,14 @@ if [ $NOTMUCH_HAVE_XAPIAN_COMPACT -eq 0 ]; then test_expect_equal "$output" "notmuch was compiled against a xapian version lacking compaction support. Compaction failed: Unsupported operation" - test_expect_code 1 "Compact unsupported: status code" "notmuch compact" + test_begin_subtest "Compact unsupported: status code" + test_expect_code 1 "notmuch compact" 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 +32,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"