X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Femacs-show;h=ec863334381876ed1296a64853b18ef005d59692;hb=3d4b0930bdc135d8f8edff1f29adb4d3ad0673ad;hp=9f2ccb0e54fb86182e0448a035a9c0f07fa059ac;hpb=401dbebd4803477563eff03d719605ed37a8e44d;p=notmuch diff --git a/test/emacs-show b/test/emacs-show index 9f2ccb0e..ec863334 100755 --- 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 @@ -182,14 +181,14 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) (with-current-buffer \"*Notmuch errors*\" (test-output \"ERROR\")) (test-output))" -sed -i -e 's/^\[.*\]$/[XXX]/' ERROR -test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\ ---- +test_expect_equal "$(notmuch_emacs_error_sanitize notmuch_fail OUTPUT MESSAGES ERROR)" "\ +=== OUTPUT === +=== MESSAGES === This is an error (see *Notmuch errors* for more details) ---- +=== ERROR === [XXX] This is an error -command: $PWD/notmuch_fail show --format\\=json --format-version\\=1 --exclude\\=false \\' \\* \\' +command: YYY/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\' exit status: 1 stderr: This is an error