CLI: define and use format version 5

[notmuch] / test / T450-emacs-show.sh

diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
index de1755d2da890d6891db54cdff0e35bd7e986f58..a750cc4dd6984173a25e3e7351e3d45ae733ee24 100755 (executable)
--- a/test/T450-emacs-show.sh
+++ b/test/T450-emacs-show.sh
@@ -2,9 +2,11 @@
 
 test_description="emacs notmuch-show view"
 . $(dirname "$0")/test-lib.sh || exit 1
+. $NOTMUCH_SRCDIR/test/test-lib-emacs.sh || exit 1
 
 EXPECTED=$NOTMUCH_SRCDIR/test/emacs-show.expected-output
 
+test_require_emacs
 add_email_corpus
 
 test_begin_subtest "Hiding Original Message region at beginning of a message"
@@ -177,7 +179,7 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
                   (let ((inhibit-read-only t)) (erase-buffer)))
               (condition-case err
                   (notmuch-show \"*\")
-                (error (message \"%s\" (second err))))
+                (error (message \"%s\" (cadr err))))
               (notmuch-test-wait)
               (with-current-buffer \"*Messages*\"
                  (test-output \"MESSAGES\"))
@@ -189,9 +191,8 @@ test_expect_equal "$(notmuch_emacs_error_sanitize notmuch_fail OUTPUT MESSAGES E
 === MESSAGES ===
 This is an error (see *Notmuch errors* for more details)
 === ERROR ===
-[XXX]
 This is an error
-command: YYY/notmuch_fail show --format\\=sexp --format-version\\=4 --decrypt\\=true --exclude\\=false \\' \\* \\'
+command: YYY/notmuch_fail show --format\\=sexp --format-version\\=5 --decrypt\\=true --exclude\\=false \\' \\* \\'
 exit status: 1
 stderr:
 This is an error