diff options
| author | David Bremner <david@tethera.net> | 2016-11-27 23:01:42 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-12-07 07:00:40 -0400 |
| commit | d74c5345704136611f993ca38e0d035b1da798b6 (patch) | |
| tree | a9d5383e410994bb0261d704fe1a102f9639e1d7 /test | |
| parent | 9259b97fa2659ae6b6dbcd49b04db087e64036ad (diff) | |
cli/insert: return EX_TEMPFAIL for some errors
Attempt to distinguish between errors indicating misconfiguration or
programmer error, which we consider "permanent", in the sense that
automatic retries are unlikely to be useful, and those indicating
transient error conditions. We consider XAPIAN_EXCEPTION transient
because it covers the important special case of locking failure.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T070-insert.sh | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/test/T070-insert.sh b/test/T070-insert.sh index 43b3abcf..57472b91 100755 --- a/test/T070-insert.sh +++ b/test/T070-insert.sh @@ -189,7 +189,6 @@ notmuch config set new.tags $OLDCONFIG for code in OUT_OF_MEMORY XAPIAN_EXCEPTION FILE_NOT_EMAIL \ READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR; do -gen_insert_msg cat <<EOF > index-file-$code.gdb set breakpoint pending on set logging file index-file-$code.log @@ -201,17 +200,30 @@ continue end run EOF -test_begin_subtest "error exit when add_message returns $code" -gdb --batch-silent --return-child-result \ - -ex "set args insert < $gen_msg_filename" \ - -x index-file-$code.gdb notmuch -test_expect_equal $? 1 +done + +gen_insert_msg + +for code in FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR; do + test_expect_code 1 "EXIT_FAILURE when add_message returns $code" \ + "gdb --batch-silent --return-child-result \ + -ex 'set args insert < $gen_msg_filename' \ + -x index-file-$code.gdb notmuch" + test_expect_code 0 "success exit with --keep when add_message returns $code" \ + "gdb --batch-silent --return-child-result \ + -ex 'set args insert --keep < $gen_msg_filename' \ + -x index-file-$code.gdb notmuch" +done -test_begin_subtest "success exit with --keep when add_message returns $code" -gdb --batch-silent --return-child-result \ - -ex "set args insert --keep < $gen_msg_filename" \ - -x index-file-$code.gdb notmuch -test_expect_equal $? 0 +for code in OUT_OF_MEMORY XAPIAN_EXCEPTION ; do + test_expect_code 75 "EX_TEMPFAIL when add_message returns $code" \ + "gdb --batch-silent --return-child-result \ + -ex 'set args insert < $gen_msg_filename' \ + -x index-file-$code.gdb notmuch" + test_expect_code 0 "success exit with --keep when add_message returns $code" \ + "gdb --batch-silent --return-child-result \ + -ex 'set args insert --keep < $gen_msg_filename' \ + -x index-file-$code.gdb notmuch" done test_done |