compact: catch Xapian::Error consistently

[notmuch] / test / emacs-show

diff --git a/test/emacs-show b/test/emacs-show
index ebf530bc7bfec326938a2daf528ee79f6e82bbd6..fb23db4d1dfda8a69931517891f38db533550594 100755 (executable)
--- a/test/emacs-show
+++ b/test/emacs-show
@@ -91,8 +91,7 @@ test_begin_subtest "notmuch-show: elide non-matching messages (w/ prefix arg to
 test_emacs '(let ((notmuch-show-only-matching-messages nil))
        (notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
        (notmuch-test-wait)
-       (let ((current-prefix-arg t))
-         (notmuch-search-show-thread))
+       (notmuch-search-show-thread t)
        (notmuch-test-wait)
        (test-visible-output))'
 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on
@@ -172,16 +171,28 @@ exit 1
 EOF
 chmod a+x notmuch_fail
 test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
-              (ignore-errors (notmuch-show \"*\"))
+              (with-current-buffer \"*Messages*\" (erase-buffer))
+              (condition-case err
+                  (notmuch-show \"*\")
+                (error (message \"%s\" (second err))))
               (notmuch-test-wait)
-              (test-output)
+              (with-current-buffer \"*Messages*\"
+                 (test-output \"MESSAGES\"))
               (with-current-buffer \"*Notmuch errors*\"
-                 (test-output \"ERROR\")))"
-test_expect_equal "$(cat OUTPUT ERROR)" "\
-Error invoking notmuch.  $PWD/notmuch_fail show --format=json --format-version=1 --exclude=false ' * ' exited with status 1.
-Error:
+                 (test-output \"ERROR\"))
+              (test-output))"
+sed -i -e 's/^\[.*\]$/[XXX]/' ERROR
+test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\
+---
+This is an error (see *Notmuch errors* for more details)
+---
+[XXX]
 This is an error
-Output:
+command: $PWD/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\'
+exit status: 1
+stderr:
+This is an error
+stdout:
 This is output"