X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FT310-emacs.sh;h=61bc369af494208aa919073f244d835a3912ca45;hb=e038b95ffe18b13fb47f4982ddc969669172cb32;hp=00ae96a89aa8de2e9e79ffaa75f8aa12f4e42064;hpb=718d58ade00a699adbff3dbbe84f7851daad9cd7;p=notmuch
diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index 00ae96a8..61bc369a 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
test_description="emacs interface"
-. ./test-lib.sh
+. ./test-lib.sh || exit 1
EXPECTED=$TEST_DIRECTORY/emacs.expected-output
@@ -483,7 +483,7 @@ test_expect_equal_file OUTPUT EXPECTED
test_begin_subtest "Reply within emacs to an html-only message"
add_message '[content-type]="text/html"' \
'[body]="Hi,
This is an HTML test message.
OK?"'
-test_emacs "(let ((message-hidden-headers '()) (mm-text-html-renderer 'html2text))
+test_emacs "(let ((message-hidden-headers '()))
(notmuch-show \"id:${gen_msg_id}\")
(notmuch-show-reply)
(test-output))"
@@ -877,7 +877,8 @@ exit 1
EOF
chmod a+x notmuch_fail
test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
- (with-current-buffer \"*Messages*\" (erase-buffer))
+ (with-current-buffer \"*Messages*\"
+ (let ((inhibit-read-only t)) (erase-buffer)))
(with-current-buffer (get-buffer-create \"*Notmuch errors*\")
(erase-buffer))
(notmuch-search \"tag:inbox\")
@@ -909,7 +910,8 @@ exit 0
EOF
chmod a+x notmuch_fail
test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
- (with-current-buffer \"*Messages*\" (erase-buffer))
+ (with-current-buffer \"*Messages*\"
+ (let ((inhibit-read-only t)) (erase-buffer)))
(with-current-buffer (get-buffer-create \"*Notmuch errors*\")
(erase-buffer))
(notmuch-search \"tag:inbox\")
@@ -953,4 +955,15 @@ test_emacs '(notmuch-search "subject:\"search race test\" -subject:two")
output=$(notmuch search --output=messages 'tag:search-global-race-tag')
test_expect_equal "$output" "id:$gen_msg_id_1"
+test_begin_subtest "Term escaping"
+output=$(test_emacs "(mapcar 'notmuch-escape-boolean-term (list
+ \"\"
+ \"abc\`~\!@#\$%^&*-=_+123\"
+ \"(abc\"
+ \")abc\"
+ \"\\\"abc\"
+ \"\x01xyz\"
+ \"\\x201cxyz\\x201d\"))")
+test_expect_equal "$output" '("\"\"" "abc`~!@#$%^&*-=_+123" "\"(abc\"" "\")abc\"" "\"\"\"abc\"" "\"'$'\x01''xyz\"" "\"âxyzâ\"")'
+
test_done