diff options
| author | David Bremner <david@tethera.net> | 2016-12-07 07:28:46 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-12-07 07:30:12 -0400 |
| commit | 71f1228a518f08e94dc1ea4e2147f80d3484c615 (patch) | |
| tree | cfc88070f6c172511d51134045101b38fcda1b65 /test | |
| parent | e682c8f8f84fe5f7af30280bd8ea437772e154fa (diff) | |
| parent | d74c5345704136611f993ca38e0d035b1da798b6 (diff) | |
Merge branch 'release'
Merge changes for notmuch-insert error handling, debian bugfix release
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T070-insert.sh | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/test/T070-insert.sh b/test/T070-insert.sh index c2485bb2..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,15 +200,30 @@ continue end run EOF -test_begin_subtest "error exit when add_message returns $code" -gdb --batch-silent --return-child-result -x index-file-$code.gdb \ - --args notmuch insert < $gen_msg_filename -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 -x index-file-$code.gdb \ - --args notmuch insert --keep < $gen_msg_filename -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 |