Re: batch 6, API exception handling cleanup.

Subject: Re: batch 6, API exception handling cleanup.

Date: Thu, 23 Jul 2020 07:51:35 -0300

To: notmuch@notmuchmail.org

Cc:

From: David Bremner

David Bremner <david@tethera.net> writes:

> These follow the series at
>
>       id:20200714224119.717845-1-david@tethera.net
>
> Probably most interesting is 
>
>      [PATCH 10/10] test: add known broken test for indexing relative path
>
> That test is also part of the bug report
>           
>      id:87sgdqo0rz.fsf@tethera.net

Queued, with some minor updates:

diff --git a/test/T562-lib-database.sh b/test/T562-lib-database.sh
index d2749a80..e64f0f12 100755
--- a/test/T562-lib-database.sh
+++ b/test/T562-lib-database.sh
@@ -140,12 +140,14 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
         EXPECT0(notmuch_database_close (db));
         ret = notmuch_database_needs_upgrade (db);
         printf ("%d\n", ret == FALSE);
+        stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }
 EOF
 cat <<EOF > EXPECTED
 == stdout ==
 1
 == stderr ==
+A Xapian exception occurred at lib/database.cc:XXX: Database has been closed
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
@@ -173,6 +175,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
         stat = notmuch_database_begin_atomic (db);
         printf ("%d\n", stat == NOTMUCH_STATUS_SUCCESS ||
                         stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+        stat = NOTMUCH_STATUS_SUCCESS;
     }
 EOF
 cat <<EOF > EXPECTED
@@ -190,6 +193,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
         stat = notmuch_database_end_atomic (db);
         printf ("%d\n", stat == NOTMUCH_STATUS_SUCCESS ||
                         stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+        stat = NOTMUCH_STATUS_SUCCESS;
     }
 EOF
 cat <<EOF > EXPECTED
@@ -234,7 +238,6 @@ A Xapian exception occurred creating a directory: Database has been closed.
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
-# XXX TODO: test with relative path
 test_begin_subtest "index file with a closed db"
 cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org

Thread: