From a581755fbbf4149c33740779a85f3ee1f11cd7e9 Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Mon, 23 May 2022 20:38:56 -0300
Subject: [PATCH] test: _notmuch_message_remove_term catches exceptions.

Unfortunately we can't differentiate between the two distinct error
conditions for Document::remove_term.
---
 test/T566-lib-message.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/T566-lib-message.sh b/test/T566-lib-message.sh
index bc9bfcb6..bac2be66 100755
--- a/test/T566-lib-message.sh
+++ b/test/T566-lib-message.sh
@@ -324,6 +324,24 @@ cat <<EOF > EXPECTED
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
+test_begin_subtest "_notmuch_message_remove_term catches exceptions"
+cat c_head0 - c_tail <<'EOF' | test_private_C ${MAIL_DIR}
+    {
+	notmuch_private_status_t status;
+	/* Xapian throws the same exception for empty and non-existent terms;
+	 * error string varies between Xapian versions. */
+	status = _notmuch_message_remove_term (message, "tag", "nonexistent");
+	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
+
 test_begin_subtest "Handle removing all tags with closed db"
 cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
-- 
2.43.0