X-Git-Url: https://git.cworth.org/git?p=obsolete%2Fnotmuch-old;a=blobdiff_plain;f=test%2Femacs-show;h=9f2ccb0e54fb86182e0448a035a9c0f07fa059ac;hp=ebf530bc7bfec326938a2daf528ee79f6e82bbd6;hb=401dbebd4803477563eff03d719605ed37a8e44d;hpb=c31a91bc5c270a9f416b63bb75c95f6274fce978

diff --git a/test/emacs-show b/test/emacs-show
index ebf530bc..9f2ccb0e 100755
--- a/test/emacs-show
+++ b/test/emacs-show
@@ -172,16 +172,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\\=json --format-version\\=1 --exclude\\=false \\' \\* \\'
+exit status: 1
+stderr:
+This is an error
+stdout:
 This is output"