diff options
| author | Dmitry Kurochkin <dmitry.kurochkin@gmail.com> | 2011-05-10 10:25:08 +0400 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2011-05-27 16:07:29 -0700 |
| commit | a0ebd5c5e47fd6a5effaa81a4ea39f2d16b709d1 (patch) | |
| tree | f82e73a04d86f758ca96f6b4d01a99254d15e819 /test/emacs-large-search-buffer | |
| parent | 33cf04c6a5f76cba2bf56a27504eaf9ac022f5a2 (diff) | |
test: use `princ' instead of `message' calls in emacs tests
The patch replaces all (message (buffer-string)) calls in emacs
tests with (princ (buffer-string)). This avoids accidentally
interpreting '%' as format specifiers and makes code simpler
because we do not need to capture stderr.
Also, the patch works around an Emacs (23.3+1-1 on current Debian
Unstable) segfault in "Ensure that emacs doesn't drop results"
test. Note: the segfault does not happen on every test run.
Though, it seems to be consistently reproducible if the test uses
300 messages instead of 30. Hopefully, it is the crash described
in Emacs bug #8545 [1] which is already fixed.
[1] http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8545
Diffstat (limited to 'test/emacs-large-search-buffer')
| -rwxr-xr-x | test/emacs-large-search-buffer | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer index 56caf1f..c78ce33 100755 --- a/test/emacs-large-search-buffer +++ b/test/emacs-large-search-buffer @@ -21,11 +21,12 @@ notmuch new > /dev/null 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/xxx*/[BLOB]/g') + +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) (message (buffer-string))' 2>&1) +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)" |