summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1a8060b)
The original generic handler had an extra '%s' in the format
string. Update tests that failed to catch this because the template to
print status strings checked 'stat', which was not set.
_log_xapian_exception (const char *where, notmuch_message_t *message, const Xapian::Error error) {
notmuch_database_t *notmuch = notmuch_message_get_database (message);
_notmuch_database_log (notmuch,
_log_xapian_exception (const char *where, notmuch_message_t *message, const Xapian::Error error) {
notmuch_database_t *notmuch = notmuch_message_get_database (message);
_notmuch_database_log (notmuch,
- "A Xapian exception occurred %s retrieving %s : %s\n",
+ "A Xapian exception occurred at %s: %s\n",
where,
error.get_msg ().c_str ());
notmuch->exception_reported = true;
where,
error.get_msg ().c_str ());
notmuch->exception_reported = true;
const char *id2;
id2=notmuch_message_get_message_id (message);
printf("%d\n%d\n", message != NULL, id2==NULL);
const char *id2;
id2=notmuch_message_get_message_id (message);
printf("%d\n%d\n", message != NULL, id2==NULL);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
EOF
test_expect_equal_file EXPECTED OUTPUT
const char *id2;
id2=notmuch_message_get_thread_id (message);
printf("%d\n%d\n", message != NULL, id2==NULL);
const char *id2;
id2=notmuch_message_get_thread_id (message);
printf("%d\n%d\n", message != NULL, id2==NULL);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
EOF
test_expect_equal_file EXPECTED OUTPUT
const char *from;
from=notmuch_message_get_header (message, "from");
printf("%s\n%d\n", id, from == NULL);
const char *from;
from=notmuch_message_get_header (message, "from");
printf("%s\n%d\n", id, from == NULL);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
1258471718-6781-1-git-send-email-dottedmag@dottedmag.net
1
== stderr ==
1258471718-6781-1-git-send-email-dottedmag@dottedmag.net
1
== stderr ==
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
EOF
test_expect_equal_file EXPECTED OUTPUT
notmuch_messages_t *replies;
replies = notmuch_message_get_replies (message);
printf("%d\n%d\n", message != NULL, replies==NULL);
notmuch_messages_t *replies;
replies = notmuch_message_get_replies (message);
printf("%d\n%d\n", message != NULL, replies==NULL);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
const char *filename;
filename = notmuch_message_get_filename (message);
printf("%d\n%d\n", message != NULL, filename == NULL);
const char *filename;
filename = notmuch_message_get_filename (message);
printf("%d\n%d\n", message != NULL, filename == NULL);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
EOF
test_expect_equal_file EXPECTED OUTPUT
notmuch_filenames_t *filenames;
filenames = notmuch_message_get_filenames (message);
printf("%d\n%d\n", message != NULL, filenames == NULL);
notmuch_filenames_t *filenames;
filenames = notmuch_message_get_filenames (message);
printf("%d\n%d\n", message != NULL, filenames == NULL);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
EOF
test_expect_equal_file EXPECTED OUTPUT
notmuch_bool_t result;
result = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_GHOST);
printf("%d\n%d\n", message != NULL, result == FALSE);
notmuch_bool_t result;
result = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_GHOST);
printf("%d\n%d\n", message != NULL, result == FALSE);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
EOF
test_expect_equal_file EXPECTED OUTPUT
time_t result;
result = notmuch_message_get_date (message);
printf("%d\n%d\n", message != NULL, result == 0);
time_t result;
result = notmuch_message_get_date (message);
printf("%d\n%d\n", message != NULL, result == 0);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
EOF
test_expect_equal_file EXPECTED OUTPUT
notmuch_tags_t *result;
result = notmuch_message_get_tags (message);
printf("%d\n%d\n", message != NULL, result == NULL);
notmuch_tags_t *result;
result = notmuch_message_get_tags (message);
printf("%d\n%d\n", message != NULL, result == NULL);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
EOF
test_expect_equal_file EXPECTED OUTPUT
int result;
result = notmuch_message_count_files (message);
printf("%d\n%d\n", message != NULL, result < 0);
int result;
result = notmuch_message_count_files (message);
printf("%d\n%d\n", message != NULL, result < 0);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle adding tag with closed database"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle adding tag with closed database"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- notmuch_status_t status;
- status = notmuch_message_add_tag (message, "boom");
- printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+ stat = notmuch_message_add_tag (message, "boom");
+ printf("%d\n%d\n", message != NULL, stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle removing tag with closed database"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle removing tag with closed database"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- notmuch_status_t status;
- status = notmuch_message_remove_tag (message, "boom");
- printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+ stat = notmuch_message_remove_tag (message, "boom");
+ printf("%d\n%d\n", message != NULL, stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
EOF
test_expect_equal_file EXPECTED OUTPUT
notmuch_bool_t is_set = -1;
is_set = notmuch_message_has_maildir_flag (message, 'S');
printf("%d\n%d\n", message != NULL, is_set == FALSE || is_set == TRUE);
notmuch_bool_t is_set = -1;
is_set = notmuch_message_has_maildir_flag (message, 'S');
printf("%d\n%d\n", message != NULL, is_set == FALSE || is_set == TRUE);
+ stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle checking maildir flag with closed db (new API)"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle checking maildir flag with closed db (new API)"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- notmuch_status_t status;
- status = notmuch_message_has_maildir_flag_st (message, 'S', &out);
- printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+ stat = notmuch_message_has_maildir_flag_st (message, 'S', &out);
+ printf("%d\n%d\n", message != NULL, stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle converting maildir flags to tags with closed db"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle converting maildir flags to tags with closed db"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- notmuch_status_t status;
- status = notmuch_message_maildir_flags_to_tags (message);
- printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+ stat = notmuch_message_maildir_flags_to_tags (message);
+ printf("%d\n%d\n", message != NULL, stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle removing all tags with closed db"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle removing all tags with closed db"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- notmuch_status_t status;
- status = notmuch_message_remove_all_tags (message);
- printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+ stat = notmuch_message_remove_all_tags (message);
+ printf("%d\n%d\n", message != NULL, stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle freezing message with closed db"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle freezing message with closed db"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- notmuch_status_t status;
- status = notmuch_message_freeze (message);
- printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_SUCCESS);
+ stat = notmuch_message_freeze (message);
+ printf("%d\n%d\n", message != NULL, stat == NOTMUCH_STATUS_SUCCESS);
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
test_begin_subtest "Handle thawing message with closed db"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
test_begin_subtest "Handle thawing message with closed db"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- notmuch_status_t status;
- status = notmuch_message_thaw (message);
- printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW);
+ stat = notmuch_message_thaw (message);
+ printf("%d\n%d\n", message != NULL, stat == NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW);
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
test_begin_subtest "Handle reindexing message with closed db"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
test_begin_subtest "Handle reindexing message with closed db"
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
- notmuch_status_t status;
- status = notmuch_message_reindex (message, NULL);
- printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+ stat = notmuch_message_reindex (message, NULL);
+ printf("%d\n%d\n", message != NULL, stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
}
EOF
cat <<EOF > EXPECTED
}
EOF
cat <<EOF > EXPECTED
+A Xapian exception occurred at lib/message.cc:XXX: Database has been closed
EOF
test_expect_equal_file EXPECTED OUTPUT
EOF
test_expect_equal_file EXPECTED OUTPUT