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 7/8] lib: fix error return bug with n_d_set_config.
Date: Sun, 19 Jul 2020 10:18:56 -0300	[thread overview]
Message-ID: <20200719131857.158655-8-david@tethera.net> (raw)
In-Reply-To: <20200719131857.158655-1-david@tethera.net>

The catch block either needs to return, or the function needs to
return "status". Choose the latter for consistency with
n_d_get_config.
---
 lib/config.cc             | 2 +-
 test/T562-lib-database.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/config.cc b/lib/config.cc
index 292f0288..20036471 100644
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -60,7 +60,7 @@ notmuch_database_set_config (notmuch_database_t *notmuch,
 	_notmuch_database_log (notmuch, "Error: A Xapian exception occurred setting metadata: %s\n",
 			       error.get_msg ().c_str ());
     }
-    return NOTMUCH_STATUS_SUCCESS;
+    return status;
 }
 
 static notmuch_status_t
diff --git a/test/T562-lib-database.sh b/test/T562-lib-database.sh
index 46a1b843..81d5c540 100755
--- a/test/T562-lib-database.sh
+++ b/test/T562-lib-database.sh
@@ -349,7 +349,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "set config in closed database"
-test_subtest_known_broken
 cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         EXPECT0(notmuch_database_close (db));
-- 
2.27.0

  parent reply	other threads:[~2020-07-19 13:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-19 13:18 batch 7, API exception handline cleanup David Bremner
2020-07-19 13:18 ` [PATCH 1/8] test: add known broken test for notmuch_database_remove_message David Bremner
2020-07-19 13:18 ` [PATCH 2/8] lib: rename _n_d_create to _n_d_find_or_create David Bremner
2020-07-19 13:18 ` [PATCH 3/8] lib: add regression test for n_d_find_message_by_filename David Bremner
2020-07-19 13:18 ` [PATCH 4/8] lib: add regresion test for n_d_get_all_tags David Bremner
2020-07-19 13:18 ` [PATCH 5/8] test: add regression test for n_d_get_config David Bremner
2020-07-19 13:18 ` [PATCH 6/8] test: add known broken test for n_d_set_config David Bremner
2020-07-19 13:18 ` David Bremner [this message]
2020-07-19 13:18 ` [PATCH 8/8] test: add known broken test for n_d_get_default_indexopts David Bremner
2020-07-19 13:28   ` David Bremner
2020-07-26 11:48     ` [PATCH] lib: return NULL from n_d_get_default_indexopts on error David Bremner
2020-07-27 11:25 ` batch 7, API exception handline 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=20200719131857.158655-8-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).