unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 10/14] lib: fix return value for n_directory_delete
Date: Sat,  1 Aug 2020 09:25:59 -0300	[thread overview]
Message-ID: <20200801122603.285803-11-david@tethera.net> (raw)
In-Reply-To: <20200801122603.285803-1-david@tethera.net>

Falling out of the catch meant the error return was lost
---
 lib/directory.cc           | 2 +-
 test/T563-lib-directory.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/directory.cc b/lib/directory.cc
index 79ceea31..eee8254e 100644
--- 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 b91a1c87..7e44e805 100755
--- 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);
-- 
2.27.0

  parent reply	other threads:[~2020-08-01 12:26 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-01 12:25 Final (v2) batch of patches in API exception handling cleanup David Bremner
2020-08-01 12:25 ` [PATCH 01/14] lib: return NULL from n_d_get_default_indexopts on error David Bremner
2020-08-01 12:25 ` [PATCH 02/14] test: add regression test for n_messages_collect_tags David Bremner
2020-08-01 12:25 ` [PATCH 03/14] test: split header for lib-message tests David Bremner
2020-08-01 12:25 ` [PATCH 04/14] test: regression test for n_m_get_filenames David Bremner
2020-08-01 12:25 ` [PATCH 05/14] test: add known broken test for n_directory_get_child_directories David Bremner
2020-08-01 12:25 ` [PATCH 06/14] lib: catch exceptions in n_directory_get_child_directories David Bremner
2020-08-01 12:25 ` [PATCH 07/14] test: add known broken test for n_directory_get_child_files David Bremner
2020-08-01 12:25 ` [PATCH 08/14] lib: catch exceptions in n_directory_get_child_files David Bremner
2020-08-01 12:25 ` [PATCH 09/14] test: known broken test for n_directory_delete with closed db David Bremner
2020-08-01 12:25 ` David Bremner [this message]
2020-08-01 12:26 ` [PATCH 11/14] test: regression test for n_directory_{get,set}_mtime David Bremner
2020-08-01 12:26 ` [PATCH 12/14] test: regression test for n_d_get_config_list on closed db David Bremner
2020-08-01 12:26 ` [PATCH 13/14] test: regression test for traversing config list with " David Bremner
2020-08-01 12:26 ` [PATCH 14/14] test: regression tests for n_indexopts_{get,set}_decrypt_policy David Bremner
2020-08-04  1:38 ` Final (v2) batch of patches in API exception handling cleanup David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200801122603.285803-11-david@tethera.net \
    --to=david@tethera.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).