emacs: Use streaming S-expr parser for search

[notmuch] / test / emacs

diff --git a/test/emacs b/test/emacs
index e3cf4690cee4a82b5eca1c0608d091bf9c5a9e04..5bc3efcc6a87dc65b19031d489a804cc52b5fa2e 100755 (executable)
--- a/test/emacs
+++ b/test/emacs
@@ -858,7 +858,7 @@ test_expect_success "Rendering HTML mail with images" \
 test_begin_subtest "Search handles subprocess error exit codes"
 cat > notmuch_fail <<EOF
 #!/bin/sh
 test_begin_subtest "Search handles subprocess error exit codes"
 cat > notmuch_fail <<EOF
 #!/bin/sh

-echo This is output
+echo '()'

 exit 1
 EOF
 chmod a+x notmuch_fail
 exit 1
 EOF
 chmod a+x notmuch_fail


@@ -873,21 +873,19 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
               (test-output))"
 sed -i -e 's/^\[.*\]$/[XXX]/' ERROR
 test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\
               (test-output))"
 sed -i -e 's/^\[.*\]$/[XXX]/' ERROR
 test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\

-Error: Unexpected output from notmuch search:
-This is output

 End of search results.
 ---
 $PWD/notmuch_fail exited with status 1 (see *Notmuch errors* for more details)
 ---
 [XXX]
 $PWD/notmuch_fail exited with status 1
 End of search results.
 ---
 $PWD/notmuch_fail exited with status 1 (see *Notmuch errors* for more details)
 ---
 [XXX]
 $PWD/notmuch_fail exited with status 1

-command: $PWD/notmuch_fail search --format\=json --format-version\=1 --sort\=newest-first tag\:inbox
+command: $PWD/notmuch_fail search --format\=sexp --format-version\=1 --sort\=newest-first tag\:inbox

 exit status: 1"
 
 test_begin_subtest "Search handles subprocess warnings"
 cat > notmuch_fail <<EOF
 #!/bin/sh
 exit status: 1"
 
 test_begin_subtest "Search handles subprocess warnings"
 cat > notmuch_fail <<EOF
 #!/bin/sh

-echo This is output
+echo '()'

 echo This is a warning >&2
 echo This is another warning >&2
 exit 0
 echo This is a warning >&2
 echo This is another warning >&2
 exit 0


@@ -905,8 +903,6 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
               (test-output))"
 sed -i -e 's/^\[.*\]$/[XXX]/' ERROR
 test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\
               (test-output))"
 sed -i -e 's/^\[.*\]$/[XXX]/' ERROR
 test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\

-Error: Unexpected output from notmuch search:
-This is output

 End of search results.
 ---
 This is a warning (see *Notmuch errors* for more details)
 End of search results.
 ---
 This is a warning (see *Notmuch errors* for more details)