[PATCH] test: add "%s" format string to all `message' calls in emacs tests
On Tue, 10 May 2011 01:47:17 -0400, Austin Clements wrote:
> This looks good to me (and is certainly more correct), but seems
> rather roundabout. Is there a reason this code doesn't simply (princ
> (buffer-string))?
>
Thanks, Austin!
I am, unfortunately, not an Emacs Lisp expert. I did not know about
princ, so I improved what we had :) Princ seems to work fine. And
certainly looks cleaner than using message and capturing stderr. It
also fixes the segfault.
I will send another patch that uses princ instead of message.
Regards,
Dmitry
> On Tue, May 10, 2011 at 1:40 AM, Dmitry Kurochkin
> wrote:
> > The patch replaces all (message (buffer-string)) calls in emacs
> > tests with (message "%s" (buffer-string)). ?This 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.
> >
> > Also, the patch makes the code more correct - we want to avoid
> > accidentally interpreting '%' as format specifiers.
> >
> > [1] http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8545
> > ---
> >
> > The patch applies to the release-candidate/0.6 branch.
> >
> > Regards,
> > ?Dmitry
> >
> >
> > ?test/emacs ? ? ? ? ? ? ? ? ? ? | ? 18 +-
> > ?test/emacs-large-search-buffer | ? ?5 +++--
> > ?2 files changed, 12 insertions(+), 11 deletions(-)
> >
> > diff --git a/test/emacs b/test/emacs
> > index b376033..5b39423 100755
> > --- a/test/emacs
> > +++ b/test/emacs
> > @@ -7,38 +7,38 @@ EXPECTED=../emacs.expected-output
> > ?add_email_corpus
> >
> > ?test_begin_subtest "Basic notmuch-hello view in emacs"
> > -output=$(test_emacs '(notmuch-hello) (message (buffer-string))' 2>&1)
> > +output=$(test_emacs '(notmuch-hello) (message "%s" (buffer-string))' 2>&1)
> > ?expected=$(cat $EXPECTED/notmuch-hello)
> > ?test_expect_equal "$output" "$expected"
> >
> > ?test_begin_subtest "Saved search with 0 results"
> > -output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
> > notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" .
> > "tag:unread") ("empty" . "tag:doesnotexist"))) (notmuch-hello) (message
> > (buffer-string))' 2>&1)
> > +output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
> > notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" .
> > "tag:unread") ("empty" . "tag:doesnotexist"))) (notmuch-hello) (message
> > "%s" (buffer-string))' 2>&1)
> > ?expected=$(cat $EXPECTED/notmuch-hello-with-empty)
> > ?test_expect_equal "$output" "$expected"
> >
> > ?test_begin_subtest "No saved searches displayed (all with 0 results)"
> > -output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
> > "tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))' 2>&1)
> > +output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
> > "tag:doesnotexist"))) (notmuch-hello) (message "%s" (buffer-string))' 2>&1)
> > ?expected=$(cat $EXPECTED/notmuch-hello-no-saved-searches)
> > ?test_expect_equal "$output" "$expected"
> >
> > ?test_begin_subtest "Basic notmuch-search view in emacs"
> > -output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> > (message (buffer-string))' 2>&1)
> > +output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> > (message "%s" (buffer-string))' 2>&1)
> > ?expected=$(cat $EXPECTED/notmuch-search-tag-inbox)
> > ?test_expect_equal "$output" "$expected"
> >
> > ?test_begin_subtest "Navigation of notmuch-hello to search results"
> > -output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
> > (re-search-forward "inbox") (widget-button-press (point))
> > (notmuch-test-wait) (message (buffer-string))' 2>&1)
> > +output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
> > (re-search-forward "inbox") (widget-button-press (point))
> > (notmuch-test-wait) (message "%s" (buffer-string))' 2>&1)
> > ?expected=$(cat $EXPECTED/notmuch-hello-view-inbox)
> > ?test_expect_equal "$output" "$expected"
> >
> > ?test_begin_subtest "Basic notmuch-show view in emacs"
> > ?maildir_storage_thread=$(notmuch search --output=threads
> > id:20091117190054.GU3165 at dottiness.seas.harvard.edu)
> > -output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
> > (buffer-string))" 2>&1)
> > +output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
> > \"%s\" (buffer-string))" 2>&1)
> > ?expected=$(cat $EXPECTED/notmuch-show-thread-maildir-storage)
> > ?test_expect_equal "$output" "$expected"
> >
> > ?test_begin_subtest "Navigation of notmuch-search to thread view"
> > -output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> > (goto-char (point-min)) (re-search-forward "Working with Maildir")
> > (notmuch-search-show-thread) (notmuch-test-wait) (message (buffer
[PATCH] test: add "%s" format string to all `message' calls in emacs tests
The patch replaces all (message (buffer-string)) calls in emacs
tests with (message "%s" (buffer-string)). This 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.
Also, the patch makes the code more correct - we want to avoid
accidentally interpreting '%' as format specifiers.
[1] http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8545
---
The patch applies to the release-candidate/0.6 branch.
Regards,
Dmitry
test/emacs | 18 +-
test/emacs-large-search-buffer |5 +++--
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/test/emacs b/test/emacs
index b376033..5b39423 100755
--- a/test/emacs
+++ b/test/emacs
@@ -7,38 +7,38 @@ EXPECTED=../emacs.expected-output
add_email_corpus
test_begin_subtest "Basic notmuch-hello view in emacs"
-output=$(test_emacs '(notmuch-hello) (message (buffer-string))' 2>&1)
+output=$(test_emacs '(notmuch-hello) (message "%s" (buffer-string))' 2>&1)
expected=$(cat $EXPECTED/notmuch-hello)
test_expect_equal "$output" "$expected"
test_begin_subtest "Saved search with 0 results"
-output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" . "tag:unread")
("empty" . "tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))'
2>&1)
+output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" . "tag:unread")
("empty" . "tag:doesnotexist"))) (notmuch-hello) (message "%s"
(buffer-string))' 2>&1)
expected=$(cat $EXPECTED/notmuch-hello-with-empty)
test_expect_equal "$output" "$expected"
test_begin_subtest "No saved searches displayed (all with 0 results)"
-output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
"tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))' 2>&1)
+output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
"tag:doesnotexist"))) (notmuch-hello) (message "%s" (buffer-string))' 2>&1)
expected=$(cat $EXPECTED/notmuch-hello-no-saved-searches)
test_expect_equal "$output" "$expected"
test_begin_subtest "Basic notmuch-search view in emacs"
-output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (message
(buffer-string))' 2>&1)
+output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (message
"%s" (buffer-string))' 2>&1)
expected=$(cat $EXPECTED/notmuch-search-tag-inbox)
test_expect_equal "$output" "$expected"
test_begin_subtest "Navigation of notmuch-hello to search results"
-output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
(re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait)
(message (buffer-string))' 2>&1)
+output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
(re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait)
(message "%s" (buffer-string))' 2>&1)
expected=$(cat $EXPECTED/notmuch-hello-view-inbox)
test_expect_equal "$output" "$expected"
test_begin_subtest "Basic notmuch-show view in emacs"
maildir_storage_thread=$(notmuch search --output=threads
id:20091117190054.GU3165 at dottiness.seas.harvard.edu)
-output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
(buffer-string))" 2>&1)
+output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
\"%s\" (buffer-string))" 2>&1)
expected=$(cat $EXPECTED/notmuch-show-thread-maildir-storage)
test_expect_equal "$output" "$expected"
test_begin_subtest "Navigation of notmuch-search to thread view"
-output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
(goto-char (point-min)) (re-search-forward "Working with Maildir")
(notmuch-search-show-thread) (notmuch-test-wait) (message (buffer-string))'
2>&1)
+output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
(goto-char (point-min)) (re-search-forward "Working with Maildir")
(notmuch-search-show-thread) (notmuch-test-wait) (message "%s"
(buffer-string))' 2>&1)
test_expect_equal "$output" "$expected"
test_begin_subtest "Add tag from search view"
@@ -102,7 +102,7 @@ test_expect_equal "$output" "thread:XXX 1974-03-29 [1/1]
Notmuch Test Suite; T
test_begin_subtest "Reply within emacs"
# We sed away everything before the ^From in the output to avoid getting
# confused by messages such as "Parsing /home/cworth/.mailrc... done"
-output=$(test_emacs '(notmuch-search "subject:\"testing message sent via
SMTP\"") (notmuch-test-wait) (notmuch-search-reply-to-thread) (message
(buffer-string))' 2>&1 | sed -ne '/^From/,$ p' | sed -e 's/^In-Reply-To:
<.*>$/In-Reply-To: /')
+output=$(test_emacs '(notmuch-search "subject:\"testing message sent via
SMTP\"") (notmuch-
[PATCH] test: add "%s" format string to all `message' calls in emacs tests
This looks good to me (and is certainly more correct), but seems
rather roundabout. Is there a reason this code doesn't simply (princ
(buffer-string))?
On Tue, May 10, 2011 at 1:40 AM, Dmitry Kurochkin
wrote:
> The patch replaces all (message (buffer-string)) calls in emacs
> tests with (message "%s" (buffer-string)). ?This 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.
>
> Also, the patch makes the code more correct - we want to avoid
> accidentally interpreting '%' as format specifiers.
>
> [1] http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8545
> ---
>
> The patch applies to the release-candidate/0.6 branch.
>
> Regards,
> ?Dmitry
>
>
> ?test/emacs ? ? ? ? ? ? ? ? ? ? | ? 18 +-
> ?test/emacs-large-search-buffer | ? ?5 +++--
> ?2 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/test/emacs b/test/emacs
> index b376033..5b39423 100755
> --- a/test/emacs
> +++ b/test/emacs
> @@ -7,38 +7,38 @@ EXPECTED=../emacs.expected-output
> ?add_email_corpus
>
> ?test_begin_subtest "Basic notmuch-hello view in emacs"
> -output=$(test_emacs '(notmuch-hello) (message (buffer-string))' 2>&1)
> +output=$(test_emacs '(notmuch-hello) (message "%s" (buffer-string))' 2>&1)
> ?expected=$(cat $EXPECTED/notmuch-hello)
> ?test_expect_equal "$output" "$expected"
>
> ?test_begin_subtest "Saved search with 0 results"
> -output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
> notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" . "tag:unread")
> ("empty" . "tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))'
> 2>&1)
> +output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
> notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" . "tag:unread")
> ("empty" . "tag:doesnotexist"))) (notmuch-hello) (message "%s"
> (buffer-string))' 2>&1)
> ?expected=$(cat $EXPECTED/notmuch-hello-with-empty)
> ?test_expect_equal "$output" "$expected"
>
> ?test_begin_subtest "No saved searches displayed (all with 0 results)"
> -output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
> "tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))' 2>&1)
> +output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
> "tag:doesnotexist"))) (notmuch-hello) (message "%s" (buffer-string))' 2>&1)
> ?expected=$(cat $EXPECTED/notmuch-hello-no-saved-searches)
> ?test_expect_equal "$output" "$expected"
>
> ?test_begin_subtest "Basic notmuch-search view in emacs"
> -output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> (message (buffer-string))' 2>&1)
> +output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> (message "%s" (buffer-string))' 2>&1)
> ?expected=$(cat $EXPECTED/notmuch-search-tag-inbox)
> ?test_expect_equal "$output" "$expected"
>
> ?test_begin_subtest "Navigation of notmuch-hello to search results"
> -output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
> (re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait)
> (message (buffer-string))' 2>&1)
> +output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
> (re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait)
> (message "%s" (buffer-string))' 2>&1)
> ?expected=$(cat $EXPECTED/notmuch-hello-view-inbox)
> ?test_expect_equal "$output" "$expected"
>
> ?test_begin_subtest "Basic notmuch-show view in emacs"
> ?maildir_storage_thread=$(notmuch search --output=threads
> id:20091117190054.GU3165 at dottiness.seas.harvard.edu)
> -output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
> (buffer-string))" 2>&1)
> +output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
> \"%s\" (buffer-string))" 2>&1)
> ?expected=$(cat $EXPECTED/notmuch-show-thread-maildir-storage)
> ?test_expect_equal "$output" "$expected"
>
> ?test_begin_subtest "Navigation of notmuch-search to thread view"
> -output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> (goto-char (point-min)) (re-search-forward "Working with Maildir")
> (notmuch-search-show-thread) (notmuch-test-wait) (message (buffer-string))'
> 2>&1)
> +output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> (goto-char (point-min)) (re-search-forward "Working with Maildir")
> (notmuch-search-show-thread) (notmuch-test-wait) (message "%s"
> (buffer-string))' 2>&1)
> ?test_expect_equal "$output" "$expected"
>
> ?test_begin_subtest "Add tag from search view"
> @@ -102,7 +102,7 @@ test_expect_equal "$output" "thread:XXX ? 1974-03-29
> [1/1] Notmuch Test Suite; T
> ?test_begin_subtest "Reply within emacs"
> ?# We sed away everything before the ^From in the output to avoid getting
> ?# con
Re: [PATCH] test: add "%s" format string to all `message' calls in emacs tests
On Tue, 10 May 2011 01:47:17 -0400, Austin Clements wrote:
> This looks good to me (and is certainly more correct), but seems
> rather roundabout. Is there a reason this code doesn't simply (princ
> (buffer-string))?
>
Thanks, Austin!
I am, unfortunately, not an Emacs Lisp expert. I did not know about
princ, so I improved what we had :) Princ seems to work fine. And
certainly looks cleaner than using message and capturing stderr. It
also fixes the segfault.
I will send another patch that uses princ instead of message.
Regards,
Dmitry
> On Tue, May 10, 2011 at 1:40 AM, Dmitry Kurochkin
> wrote:
> > The patch replaces all (message (buffer-string)) calls in emacs
> > tests with (message "%s" (buffer-string)). This 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.
> >
> > Also, the patch makes the code more correct - we want to avoid
> > accidentally interpreting '%' as format specifiers.
> >
> > [1] http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8545
> > ---
> >
> > The patch applies to the release-candidate/0.6 branch.
> >
> > Regards,
> > Dmitry
> >
> >
> > test/emacs | 18 +-
> > test/emacs-large-search-buffer | 5 +++--
> > 2 files changed, 12 insertions(+), 11 deletions(-)
> >
> > diff --git a/test/emacs b/test/emacs
> > index b376033..5b39423 100755
> > --- a/test/emacs
> > +++ b/test/emacs
> > @@ -7,38 +7,38 @@ EXPECTED=../emacs.expected-output
> > add_email_corpus
> >
> > test_begin_subtest "Basic notmuch-hello view in emacs"
> > -output=$(test_emacs '(notmuch-hello) (message (buffer-string))' 2>&1)
> > +output=$(test_emacs '(notmuch-hello) (message "%s" (buffer-string))' 2>&1)
> > expected=$(cat $EXPECTED/notmuch-hello)
> > test_expect_equal "$output" "$expected"
> >
> > test_begin_subtest "Saved search with 0 results"
> > -output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
> > notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" .
> > "tag:unread") ("empty" . "tag:doesnotexist"))) (notmuch-hello) (message
> > (buffer-string))' 2>&1)
> > +output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
> > notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" .
> > "tag:unread") ("empty" . "tag:doesnotexist"))) (notmuch-hello) (message
> > "%s" (buffer-string))' 2>&1)
> > expected=$(cat $EXPECTED/notmuch-hello-with-empty)
> > test_expect_equal "$output" "$expected"
> >
> > test_begin_subtest "No saved searches displayed (all with 0 results)"
> > -output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
> > "tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))' 2>&1)
> > +output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
> > "tag:doesnotexist"))) (notmuch-hello) (message "%s" (buffer-string))' 2>&1)
> > expected=$(cat $EXPECTED/notmuch-hello-no-saved-searches)
> > test_expect_equal "$output" "$expected"
> >
> > test_begin_subtest "Basic notmuch-search view in emacs"
> > -output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> > (message (buffer-string))' 2>&1)
> > +output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> > (message "%s" (buffer-string))' 2>&1)
> > expected=$(cat $EXPECTED/notmuch-search-tag-inbox)
> > test_expect_equal "$output" "$expected"
> >
> > test_begin_subtest "Navigation of notmuch-hello to search results"
> > -output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
> > (re-search-forward "inbox") (widget-button-press (point))
> > (notmuch-test-wait) (message (buffer-string))' 2>&1)
> > +output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
> > (re-search-forward "inbox") (widget-button-press (point))
> > (notmuch-test-wait) (message "%s" (buffer-string))' 2>&1)
> > expected=$(cat $EXPECTED/notmuch-hello-view-inbox)
> > test_expect_equal "$output" "$expected"
> >
> > test_begin_subtest "Basic notmuch-show view in emacs"
> > maildir_storage_thread=$(notmuch search --output=threads
> > id:20091117190054.gu3...@dottiness.seas.harvard.edu)
> > -output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
> > (buffer-string))" 2>&1)
> > +output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
> > \"%s\" (buffer-string))" 2>&1)
> > expected=$(cat $EXPECTED/notmuch-show-thread-maildir-storage)
> > test_expect_equal "$output" "$expected"
> >
> > test_begin_subtest "Navigation of notmuch-search to thread view"
> > -output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> > (goto-char (point-min)) (re-search-forward "Working with Maildir")
> > (notmuch-search-show-thread) (notmuch-test-wait) (message (buffer-st
Re: [PATCH] test: add "%s" format string to all `message' calls in emacs tests
This looks good to me (and is certainly more correct), but seems
rather roundabout. Is there a reason this code doesn't simply (princ
(buffer-string))?
On Tue, May 10, 2011 at 1:40 AM, Dmitry Kurochkin
wrote:
> The patch replaces all (message (buffer-string)) calls in emacs
> tests with (message "%s" (buffer-string)). This 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.
>
> Also, the patch makes the code more correct - we want to avoid
> accidentally interpreting '%' as format specifiers.
>
> [1] http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8545
> ---
>
> The patch applies to the release-candidate/0.6 branch.
>
> Regards,
> Dmitry
>
>
> test/emacs | 18 +-
> test/emacs-large-search-buffer | 5 +++--
> 2 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/test/emacs b/test/emacs
> index b376033..5b39423 100755
> --- a/test/emacs
> +++ b/test/emacs
> @@ -7,38 +7,38 @@ EXPECTED=../emacs.expected-output
> add_email_corpus
>
> test_begin_subtest "Basic notmuch-hello view in emacs"
> -output=$(test_emacs '(notmuch-hello) (message (buffer-string))' 2>&1)
> +output=$(test_emacs '(notmuch-hello) (message "%s" (buffer-string))' 2>&1)
> expected=$(cat $EXPECTED/notmuch-hello)
> test_expect_equal "$output" "$expected"
>
> test_begin_subtest "Saved search with 0 results"
> -output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
> notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" . "tag:unread")
> ("empty" . "tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))'
> 2>&1)
> +output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
> notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" . "tag:unread")
> ("empty" . "tag:doesnotexist"))) (notmuch-hello) (message "%s"
> (buffer-string))' 2>&1)
> expected=$(cat $EXPECTED/notmuch-hello-with-empty)
> test_expect_equal "$output" "$expected"
>
> test_begin_subtest "No saved searches displayed (all with 0 results)"
> -output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
> "tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))' 2>&1)
> +output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
> "tag:doesnotexist"))) (notmuch-hello) (message "%s" (buffer-string))' 2>&1)
> expected=$(cat $EXPECTED/notmuch-hello-no-saved-searches)
> test_expect_equal "$output" "$expected"
>
> test_begin_subtest "Basic notmuch-search view in emacs"
> -output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> (message (buffer-string))' 2>&1)
> +output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> (message "%s" (buffer-string))' 2>&1)
> expected=$(cat $EXPECTED/notmuch-search-tag-inbox)
> test_expect_equal "$output" "$expected"
>
> test_begin_subtest "Navigation of notmuch-hello to search results"
> -output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
> (re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait)
> (message (buffer-string))' 2>&1)
> +output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
> (re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait)
> (message "%s" (buffer-string))' 2>&1)
> expected=$(cat $EXPECTED/notmuch-hello-view-inbox)
> test_expect_equal "$output" "$expected"
>
> test_begin_subtest "Basic notmuch-show view in emacs"
> maildir_storage_thread=$(notmuch search --output=threads
> id:20091117190054.gu3...@dottiness.seas.harvard.edu)
> -output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
> (buffer-string))" 2>&1)
> +output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
> \"%s\" (buffer-string))" 2>&1)
> expected=$(cat $EXPECTED/notmuch-show-thread-maildir-storage)
> test_expect_equal "$output" "$expected"
>
> test_begin_subtest "Navigation of notmuch-search to thread view"
> -output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> (goto-char (point-min)) (re-search-forward "Working with Maildir")
> (notmuch-search-show-thread) (notmuch-test-wait) (message (buffer-string))'
> 2>&1)
> +output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
> (goto-char (point-min)) (re-search-forward "Working with Maildir")
> (notmuch-search-show-thread) (notmuch-test-wait) (message "%s"
> (buffer-string))' 2>&1)
> test_expect_equal "$output" "$expected"
>
> test_begin_subtest "Add tag from search view"
> @@ -102,7 +102,7 @@ test_expect_equal "$output" "thread:XXX 1974-03-29
> [1/1] Notmuch Test Suite; T
> test_begin_subtest "Reply within emacs"
> # We sed away everything before the ^From in the output to avoid getting
> # confus
[PATCH] test: add "%s" format string to all `message' calls in emacs tests
The patch replaces all (message (buffer-string)) calls in emacs
tests with (message "%s" (buffer-string)). This 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.
Also, the patch makes the code more correct - we want to avoid
accidentally interpreting '%' as format specifiers.
[1] http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8545
---
The patch applies to the release-candidate/0.6 branch.
Regards,
Dmitry
test/emacs | 18 +-
test/emacs-large-search-buffer |5 +++--
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/test/emacs b/test/emacs
index b376033..5b39423 100755
--- a/test/emacs
+++ b/test/emacs
@@ -7,38 +7,38 @@ EXPECTED=../emacs.expected-output
add_email_corpus
test_begin_subtest "Basic notmuch-hello view in emacs"
-output=$(test_emacs '(notmuch-hello) (message (buffer-string))' 2>&1)
+output=$(test_emacs '(notmuch-hello) (message "%s" (buffer-string))' 2>&1)
expected=$(cat $EXPECTED/notmuch-hello)
test_expect_equal "$output" "$expected"
test_begin_subtest "Saved search with 0 results"
-output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" . "tag:unread")
("empty" . "tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))'
2>&1)
+output=$(test_emacs '(setq notmuch-show-empty-saved-searches t) (setq
notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" . "tag:unread")
("empty" . "tag:doesnotexist"))) (notmuch-hello) (message "%s"
(buffer-string))' 2>&1)
expected=$(cat $EXPECTED/notmuch-hello-with-empty)
test_expect_equal "$output" "$expected"
test_begin_subtest "No saved searches displayed (all with 0 results)"
-output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
"tag:doesnotexist"))) (notmuch-hello) (message (buffer-string))' 2>&1)
+output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" .
"tag:doesnotexist"))) (notmuch-hello) (message "%s" (buffer-string))' 2>&1)
expected=$(cat $EXPECTED/notmuch-hello-no-saved-searches)
test_expect_equal "$output" "$expected"
test_begin_subtest "Basic notmuch-search view in emacs"
-output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (message
(buffer-string))' 2>&1)
+output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (message
"%s" (buffer-string))' 2>&1)
expected=$(cat $EXPECTED/notmuch-search-tag-inbox)
test_expect_equal "$output" "$expected"
test_begin_subtest "Navigation of notmuch-hello to search results"
-output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
(re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait)
(message (buffer-string))' 2>&1)
+output=$(test_emacs '(notmuch-hello) (goto-char (point-min))
(re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait)
(message "%s" (buffer-string))' 2>&1)
expected=$(cat $EXPECTED/notmuch-hello-view-inbox)
test_expect_equal "$output" "$expected"
test_begin_subtest "Basic notmuch-show view in emacs"
maildir_storage_thread=$(notmuch search --output=threads
id:20091117190054.gu3...@dottiness.seas.harvard.edu)
-output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
(buffer-string))" 2>&1)
+output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message
\"%s\" (buffer-string))" 2>&1)
expected=$(cat $EXPECTED/notmuch-show-thread-maildir-storage)
test_expect_equal "$output" "$expected"
test_begin_subtest "Navigation of notmuch-search to thread view"
-output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
(goto-char (point-min)) (re-search-forward "Working with Maildir")
(notmuch-search-show-thread) (notmuch-test-wait) (message (buffer-string))'
2>&1)
+output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait)
(goto-char (point-min)) (re-search-forward "Working with Maildir")
(notmuch-search-show-thread) (notmuch-test-wait) (message "%s"
(buffer-string))' 2>&1)
test_expect_equal "$output" "$expected"
test_begin_subtest "Add tag from search view"
@@ -102,7 +102,7 @@ test_expect_equal "$output" "thread:XXX 1974-03-29 [1/1]
Notmuch Test Suite; T
test_begin_subtest "Reply within emacs"
# We sed away everything before the ^From in the output to avoid getting
# confused by messages such as "Parsing /home/cworth/.mailrc... done"
-output=$(test_emacs '(notmuch-search "subject:\"testing message sent via
SMTP\"") (notmuch-test-wait) (notmuch-search-reply-to-thread) (message
(buffer-string))' 2>&1 | sed -ne '/^From/,$ p' | sed -e 's/^In-Reply-To:
<.*>$/In-Reply-To: /')
+output=$(test_emacs '(notmuch-search "subject:\"testing message sent via
SMTP\"") (not
