From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 1/6] test: error handling for n_m_tags_to_maildir_flags
Date: Wed, 25 May 2022 07:51:12 -0300 [thread overview]
Message-ID: <20220525105117.10709-2-david@tethera.net> (raw)
In-Reply-To: <20220525105117.10709-1-david@tethera.net>
The closed database case should fail gracefully, but currently it
segfaults.
---
test/T566-lib-message.sh | 54 +++++++++++++++++++++++++++++++++++++---
1 file changed, 51 insertions(+), 3 deletions(-)
diff --git a/test/T566-lib-message.sh b/test/T566-lib-message.sh
index 30040634..2ad24543 100755
--- a/test/T566-lib-message.sh
+++ b/test/T566-lib-message.sh
@@ -27,7 +27,7 @@ int main (int argc, char** argv)
notmuch_status_t stat;
char *msg = NULL;
notmuch_message_t *message = NULL;
- const char *id = "1258471718-6781-1-git-send-email-dottedmag@dottedmag.net";
+ const char *id = "87pr7gqidx.fsf@yoom.home.cworth.org";
stat = notmuch_database_open_verbose (argv[1], NOTMUCH_DATABASE_MODE_READ_WRITE, &db, &msg);
if (stat != NOTMUCH_STATUS_SUCCESS) {
@@ -82,7 +82,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
EOF
cat <<EOF > EXPECTED
== stdout ==
-1258471718-6781-1-git-send-email-dottedmag@dottedmag.net
+87pr7gqidx.fsf@yoom.home.cworth.org
1
== stderr ==
EOF
@@ -154,7 +154,7 @@ cat c_head0 - c_tail <<'EOF' | test_C ${MAIL_DIR}
EOF
cat <<EOF > EXPECTED
== stdout ==
-MAIL_DIR/01:2,
+MAIL_DIR/cur/40:2,
SUCCESS
== stderr ==
EOF
@@ -372,6 +372,54 @@ cat <<EOF > EXPECTED
EOF
test_expect_equal_file EXPECTED OUTPUT
+test_begin_subtest "Handle converting tags to maildir flags with closed db"
+test_subtest_known_broken
+cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
+ {
+ notmuch_status_t status;
+ status = notmuch_message_tags_to_maildir_flags (message);
+ printf("%d\n%d\n", message != NULL, status != NOTMUCH_STATUS_SUCCESS);
+ }
+EOF
+cat <<EOF > EXPECTED
+== stdout ==
+1
+1
+== stderr ==
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+POSTLIST_PATH=(${MAIL_DIR}/.notmuch/xapian/postlist.*)
+test_begin_subtest "Handle converting tags to maildir flags with corrupted db"
+backup_database
+cat c_head0 - c_tail <<'EOF' | test_C ${MAIL_DIR} ${POSTLIST_PATH}
+ {
+ notmuch_status_t status;
+
+ status = notmuch_message_add_tag (message, "draft");
+ if (status) exit(1);
+
+ int fd = open(argv[2],O_WRONLY|O_TRUNC);
+ if (fd < 0) {
+ fprintf (stderr, "error opening %s\n", argv[1]);
+ exit (1);
+ }
+
+ status = notmuch_message_tags_to_maildir_flags (message);
+ printf("%d\n%d\n", message != NULL, status != NOTMUCH_STATUS_SUCCESS);
+ }
+EOF
+cat <<EOF > EXPECTED
+== stdout ==
+1
+1
+== stderr ==
+EOF
+restore_database
+notmuch new
+notmuch tag -draft id:87pr7gqidx.fsf@yoom.home.cworth.org
+test_expect_equal_file EXPECTED OUTPUT
+
test_begin_subtest "Handle removing all tags with closed db"
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
--
2.35.2
next prev parent reply other threads:[~2022-05-25 10:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-25 10:51 notmuch_message* error handling cleanup part II David Bremner
2022-05-25 10:51 ` David Bremner [this message]
2022-05-25 10:51 ` [PATCH 2/6] test: add known broken test for notmuch_tags_valid (NULL) David Bremner
2022-05-25 10:51 ` [PATCH 3/6] lib/tag: handle NULL argument to notmuch_tags_valid David Bremner
2022-05-25 10:51 ` [PATCH 4/6] lib: Add missing private status values David Bremner
2022-05-25 10:51 ` [PATCH 5/6] lib: add NOTMUCH_STATUS_CLOSED_DATABASE, use in _n_d_ensure_writable David Bremner
2022-05-25 10:51 ` [PATCH 6/6] lib: check for writable db in n_m_tags_maildir_flags David Bremner
2022-06-25 19:38 ` notmuch_message* error handling cleanup part II 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=20220525105117.10709-2-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).