X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=test%2FT310-emacs.sh;h=d72799b4e1fff881e3d258ff81ae7277b16ee94f;hb=243d7e30dcd80041760307d8d0d2a1839f36eca2;hp=7dc9a8e084ceb2fff8408bea373d4f23f8cb9ae7;hpb=ae47d617a7b4a77dcad1dc89ae5e35abe87f0081;p=notmuch
diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index 7dc9a8e0..d72799b4 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -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))"
@@ -727,7 +727,7 @@ inbox,stashtest
${gen_msg_filename}
http://mid.gmane.org/bought
http://marc.info/?i=bought
-http://mail-archive.com/search?l=mid&q=bought
+http://mid.mail-archive.com/bought
EOF
test_expect_equal_file OUTPUT EXPECTED
@@ -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