diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-08-06 18:10:31 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-08-06 18:10:31 +0200 |
commit | 7192d0221a361d3d9cfd6626058e4a1c86ea7b44 (patch) | |
tree | 11d3db0604f47498e16b50ef7f559e138bfe4482 /test/emacs-large-search-buffer | |
parent | 6bc2f5a999d9ff77779d98b7cc688a4350ea65d9 (diff) | |
parent | 6b820673fc9c2483572af5ec7ea91e4d7d7258c9 (diff) |
Merge remote-tracking branch 'origin/master' into vim
Diffstat (limited to 'test/emacs-large-search-buffer')
-rwxr-xr-x | test/emacs-large-search-buffer | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer index 6095e9d..4351e33 100755 --- a/test/emacs-large-search-buffer +++ b/test/emacs-large-search-buffer @@ -19,25 +19,25 @@ done notmuch new > /dev/null test_begin_subtest "Ensure that emacs doesn't drop results" -notmuch search '*' > EXPEXTED -sed -i -e 's/^thread:[0-9a-f]* //' -e 's/;//' -e 's/xx*/[BLOB]/' EXPEXTED -echo 'End of search results.' >> EXPEXTED +notmuch search '*' > EXPECTED +sed -i -e 's/^thread:[0-9a-f]* //' -e 's/;//' -e 's/xx*/[BLOB]/' EXPECTED +echo 'End of search results.' >> EXPECTED test_emacs '(notmuch-search "*") (notmuch-test-wait) (test-output)' sed -i -e s', *, ,g' -e 's/xxx*/[BLOB]/g' OUTPUT -test_expect_equal_file OUTPUT EXPEXTED +test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "Ensure that emacs doesn't drop error messages" test_emacs '(notmuch-search "--this-option-does-not-exist") (notmuch-test-wait) (test-output)' -cat <<EOF >EXPEXTED +cat <<EOF >EXPECTED Error: Unexpected output from notmuch search: Unrecognized option: --this-option-does-not-exist End of search results. (process returned 1) EOF -test_expect_equal_file OUTPUT EXPEXTED +test_expect_equal_file OUTPUT EXPECTED test_done |