X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Femacs-large-search-buffer;h=c78ce334b95ae9ef923111361ff4810e9f82c4ca;hp=f827bb14ea66d086a5c537c1211dbe8fbe490709;hb=c6b49ae752e642d779941a63bc65d5107e7010f1;hpb=4e414e2a5a72e8345df6371b3524030d07c2ce96

diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer
index f827bb14..c78ce334 100755
--- a/test/emacs-large-search-buffer
+++ b/test/emacs-large-search-buffer
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 test_description="Emacs with large search results buffer"
 . test-lib.sh
 
@@ -18,10 +18,17 @@ done
 
 notmuch new > /dev/null
 
-test_begin_subtest 'Comparing emacs result to "notmuch search"'
+test_begin_subtest "Ensure that emacs doesn't drop results"
 expected="$(notmuch search '*' | sed -e 's/^thread:[0-9a-f]*  //' -e 's/;//' -e  's/xx*/[BLOB]/')
 End of search results."
-output=$(test_emacs '(notmuch-search "*") (notmuch-test-wait) (message (buffer-string))' 2>&1 | sed -e s',  *, ,g' -e 's/xx*/[BLOB]/')
+
+output=$(test_emacs '(notmuch-search "*") (notmuch-test-wait) (princ (buffer-string))' | sed -e s',  *, ,g' -e 's/xxx*/[BLOB]/g')
 test_expect_equal "$output" "$expected"
 
+test_begin_subtest "Ensure that emacs doesn't drop error messages"
+output=$(test_emacs '(notmuch-search "--this-option-does-not-exist") (notmuch-test-wait) (princ (buffer-string))')
+test_expect_equal "$output" "Error: Unexpected output from notmuch search:
+Unrecognized option: --this-option-does-not-exist
+End of search results. (process returned 1)"
+
 test_done