mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-22 02:48:08 +01:00
708c4f46ca
With the previous commit, unexpected output before or between search results would be displayed. However, trailing junk from the "notmuch search" output would still be silently swallowed. The most common case for an error message from "notmuch search" would be an invalid command-line, and in that case, there would be no search results and the trailing error message would get swallowed. We fix the process sentinel to check for leftover data and add it to the final buffer. We also add a test case to ensure this works.
33 lines
1.3 KiB
Bash
Executable file
33 lines
1.3 KiB
Bash
Executable file
#!/bin/bash
|
|
test_description="Emacs with large search results buffer"
|
|
. test-lib.sh
|
|
|
|
x=xxxxxxxxxx # 10
|
|
x=$x$x$x$x$x$x$x$x$x$x # 100
|
|
x=$x$x$x$x$x$x$x$x$x # 900
|
|
|
|
# We generate a long subject here (over 900 bytes) so that the emacs
|
|
# search results get large quickly. With 30 such messages we should
|
|
# cross several 4kB page boundaries and see the bug.
|
|
n=30
|
|
for i in $(seq 1 $n); do
|
|
# Roughly 100B2 KiB per message. That is, we need two messages in order to
|
|
# exceed the typical size of the pipe buffer (4 KiB on commodity systems).
|
|
generate_message '[subject]="$x $i of $n"'
|
|
done
|
|
|
|
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')
|
|
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)
|
|
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
|