X-Git-Url: https://git.cworth.org/git?p=notmuch;a=blobdiff_plain;f=test%2FT020-compact.sh;h=d77db00d22ff3c1abf3f9f6ab6fc863b4e591589;hp=58cd2ba74cefd7f9a1b6fa6808be7fd77c424a1c;hb=a06b76b9b3c1212b17d2bb170bdd511711f578f8;hpb=7ac96b149f5a0e5c03b64856d7c20789dab3c628 diff --git a/test/T020-compact.sh b/test/T020-compact.sh index 58cd2ba7..d77db00d 100755 --- a/test/T020-compact.sh +++ b/test/T020-compact.sh @@ -10,20 +10,8 @@ notmuch tag +tag1 \* notmuch tag +tag2 subject:Two notmuch tag -tag1 +tag3 subject:Three -if [ $NOTMUCH_HAVE_XAPIAN_COMPACT -eq 0 ]; then - test_begin_subtest "Compact unsupported: error message" - output=$(notmuch compact --quiet 2>&1) - test_expect_equal "$output" "notmuch was compiled against a xapian version lacking compaction support. -Compaction failed: Unsupported operation" - - test_begin_subtest "Compact unsupported: status code" - test_expect_code 1 "notmuch compact" - - test_done -fi - test_begin_subtest "Running compact" -test_expect_success "notmuch compact --backup=${TEST_DIRECTORY}/xapian.old" +test_expect_success "notmuch compact --backup=${TMP_DIRECTORY}/xapian.old" test_begin_subtest "Compact preserves database" output=$(notmuch search \* | notmuch_search_sanitize) @@ -34,7 +22,7 @@ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)" test_begin_subtest "Restoring Backup" test_expect_success 'rm -Rf ${MAIL_DIR}/.notmuch/xapian && - mv ${TEST_DIRECTORY}/xapian.old ${MAIL_DIR}/.notmuch/xapian' + mv ${TMP_DIRECTORY}/xapian.old ${MAIL_DIR}/.notmuch/xapian' test_begin_subtest "Checking restored backup" output=$(notmuch search \* | notmuch_search_sanitize)