lib: fix return value for n_directory_delete

Falling out of the catch meant the error return was lost

diff --git a/lib/directory.cc b/lib/directory.cc
index 79ceea31c2d4a00ae1579e6bb2fc74dc58a138c3..eee8254e7a842e18cce933907ccddeac19356474 100644 (file)
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -323,7 +323,7 @@ notmuch_directory_delete (notmuch_directory_t *directory)
     }
     notmuch_directory_destroy (directory);
 
-    return NOTMUCH_STATUS_SUCCESS;
+    return status;
 }
 
 void

diff --git a/test/T563-lib-directory.sh b/test/T563-lib-directory.sh
index b91a1c873644a43fb319d6d125a490206829a830..7e44e80561ca0200730ef4a7723ec641057bebaa 100755 (executable)
--- a/test/T563-lib-directory.sh
+++ b/test/T563-lib-directory.sh
@@ -76,7 +76,6 @@ test_expect_equal_file EXPECTED OUTPUT
 
 backup_database
 test_begin_subtest "delete directory document for a closed db"
-test_subtest_known_broken
 cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         stat = notmuch_directory_delete (dir);