Merge branch 'release'

[notmuch] / test / T070-insert.sh

diff --git a/test/T070-insert.sh b/test/T070-insert.sh
index 7e71c3b12afc1164faa9c5196f8d2296af56693b..3dd76737c53017a8e0e9665c1b4016da7a4defd7 100755 (executable)
--- a/test/T070-insert.sh
+++ b/test/T070-insert.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 test_description='"notmuch insert"'
-. ./test-lib.sh
+. ./test-lib.sh || exit 1
 
 test_require_external_prereq gdb
 
@@ -60,7 +60,7 @@ test_expect_equal_json "$output" "$expected"
 
 test_begin_subtest "Insert duplicate message"
 notmuch insert +duptag -unread < "$gen_msg_filename"
-output=$(notmuch search --output=files "subject:insert-subject" | wc -l)
+output=$((`notmuch search --output=files "subject:insert-subject" | wc -l`))
 test_expect_equal "$output" 2
 
 test_begin_subtest "Duplicate message does not change tags"
@@ -189,9 +189,10 @@ 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
+set logging on
 break notmuch_database_add_message
 commands
 return NOTMUCH_STATUS_$code
@@ -199,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
-
-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
+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" \
+         "${TEST_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" \
+         "${TEST_GDB} --batch-silent --return-child-result \
+            -ex 'set args insert --keep < $gen_msg_filename' \
+            -x index-file-$code.gdb notmuch"
+done
+
+for code in OUT_OF_MEMORY XAPIAN_EXCEPTION ; do
+    test_expect_code 75 "EX_TEMPFAIL when add_message returns $code" \
+         "${TEST_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" \
+         "${TEST_GDB} --batch-silent --return-child-result \
+            -ex 'set args insert --keep < $gen_msg_filename' \
+            -x index-file-$code.gdb notmuch"
 done
 
 test_done