This is a much cleaner way to do the emacs tests, since we're actually comparing output against existing files with expected output. We also won't miss any trailing newlines this way.
And speaking of which, one of the expected output files was actually missing a trailing blank line that was actually in one of the original messages, so this was fixed. --- test/emacs | 80 +++++++++---------- .../notmuch-show-thread-maildir-storage | 1 + 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/test/emacs b/test/emacs index 042f1cb..f14249e 100755 --- a/test/emacs +++ b/test/emacs @@ -7,39 +7,33 @@ EXPECTED=../emacs.expected-output add_email_corpus test_begin_subtest "Basic notmuch-hello view in emacs" -output=$(test_emacs '(notmuch-hello) (princ (buffer-string))') -expected=$(cat $EXPECTED/notmuch-hello) -test_expect_equal "$output" "$expected" +test_emacs '(notmuch-hello) (princ (buffer-string))' >OUTPUT +test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello 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) (princ (buffer-string))') -expected=$(cat $EXPECTED/notmuch-hello-with-empty) -test_expect_equal "$output" "$expected" +test_emacs '(setq notmuch-show-empty-saved-searches t) (setq notmuch-saved-searches '\''(("inbox" . "tag:inbox") ("unread" . "tag:unread") ("empty" . "tag:doesnotexist"))) (notmuch-hello) (princ (buffer-string))' >OUTPUT +test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-with-empty test_begin_subtest "No saved searches displayed (all with 0 results)" -output=$(test_emacs '(setq notmuch-saved-searches '\''(("empty" . "tag:doesnotexist"))) (notmuch-hello) (princ (buffer-string))') -expected=$(cat $EXPECTED/notmuch-hello-no-saved-searches) -test_expect_equal "$output" "$expected" +test_emacs '(setq notmuch-saved-searches '\''(("empty" . "tag:doesnotexist"))) (notmuch-hello) (princ (buffer-string))' >OUTPUT +test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-no-saved-searches test_begin_subtest "Basic notmuch-search view in emacs" -output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (princ (buffer-string))') -expected=$(cat $EXPECTED/notmuch-search-tag-inbox) -test_expect_equal "$output" "$expected" +test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (princ (buffer-string))' >OUTPUT +test_expect_equal_file OUTPUT $EXPECTED/notmuch-search-tag-inbox 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) (princ (buffer-string))') -expected=$(cat $EXPECTED/notmuch-hello-view-inbox) -test_expect_equal "$output" "$expected" +test_emacs '(notmuch-hello) (goto-char (point-min)) (re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait) (princ (buffer-string))' >OUTPUT +test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-view-inbox 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\") (princ (buffer-string))") -expected=$(cat $EXPECTED/notmuch-show-thread-maildir-storage) -test_expect_equal "$output" "$expected" +test_emacs "(notmuch-show \"$maildir_storage_thread\") (princ (buffer-string))" >OUTPUT +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage 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) (princ (buffer-string))') -test_expect_equal "$output" "$expected" +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) (princ (buffer-string))' >OUTPUT +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage test_begin_subtest "Add tag from search view" os_x_darwin_thread=$(notmuch search --output=threads id:ddd65cda0911171950o4eea4389v86de9525e4605...@mail.gmail.com) @@ -80,10 +74,11 @@ smtp_dummy_pid=$! test_emacs "(setq message-send-mail-function 'message-smtpmail-send-it) (setq smtpmail-smtp-server \"localhost\") (setq smtpmail-smtp-service \"25025\") (notmuch-hello) (notmuch-mua-mail) (message-goto-to) (insert \"u...@example.com\nDate: Fri, 29 Mar 1974 10:00:00 -0000\") (message-goto-subject) (insert \"Testing message sent via SMTP\") (message-goto-body) (insert \"This is a test that messages are sent via SMTP\") (message-send-and-exit)" >/dev/null 2>&1 wait ${smtp_dummy_pid} -output=$(sed \ +sed \ -e s',^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' \ - -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' < sent_message) -test_expect_equal "$output" "From: Notmuch Test Suite <test_su...@notmuchmail.org> + -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' < sent_message >OUTPUT +cat <<EOF >EXPECTED +From: Notmuch Test Suite <test_su...@notmuchmail.org> To: u...@example.com Subject: Testing message sent via SMTP Date: Fri, 29 Mar 1974 10:00:00 -0000 @@ -92,7 +87,9 @@ Message-ID: <XXX> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii -This is a test that messages are sent via SMTP" +This is a test that messages are sent via SMTP +EOF +test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "Verify that sent messages are saved/searchable (via FCC)" notmuch new > /dev/null @@ -102,37 +99,36 @@ 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) (princ (buffer-string))' | sed -ne '/^From/,$ p' | sed -e 's/^In-Reply-To: <.*>$/In-Reply-To: <XXX>/') -test_expect_equal "$output" "From: Notmuch Test Suite <test_su...@notmuchmail.org> +test_emacs '(notmuch-search "subject:\"testing message sent via SMTP\"") (notmuch-test-wait) (notmuch-search-reply-to-thread) (princ (buffer-string))' | sed -ne '/^From/,$ p' | sed -e 's/^In-Reply-To: <.*>$/In-Reply-To: <XXX>/' >OUTPUT +cat <<EOF >EXPECTED +From: Notmuch Test Suite <test_su...@notmuchmail.org> To: u...@example.com Subject: Re: Testing message sent via SMTP In-Reply-To: <XXX> Fcc: $(pwd)/mail/sent --text follows this line-- On Fri, 29 Mar 1974 10:00:00 -0000, Notmuch Test Suite <test_su...@notmuchmail.org> wrote: -> This is a test that messages are sent via SMTP" +> This is a test that messages are sent via SMTP +EOF +test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "Save attachment from within emacs" echo "./attachment" | test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052a...@mail.gmail.com") (notmuch-show-save-attachments)' > /dev/null 2>&1 -output=$(cat attachment) -expected=$(cat $EXPECTED/attachment) -test_expect_equal "$output" "$expected" +test_expect_equal_file attachment $EXPECTED/attachment test_begin_subtest "View raw message within emacs" -expected=$(cat $EXPECTED/raw-message-cf0c4d-52ad0a) -first_line=$(echo "$expected" | head -n1) -output=$(test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052a...@mail.gmail.com") (notmuch-show-view-raw-message) (princ (buffer-string))' | sed -ne "/$first_line/,\$ p") -test_expect_equal "$output" "$expected" +first_line=$(head -n1 $EXPECTED/raw-message-cf0c4d-52ad0a) +test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052a...@mail.gmail.com") (notmuch-show-view-raw-message) (princ (buffer-string))' | sed -ne "/$first_line/,\$ p" >OUTPUT +test_expect_equal_file OUTPUT $EXPECTED/raw-message-cf0c4d-52ad0a test_begin_subtest "Hiding/showing signature in notmuch-show view" maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.gu3...@dottiness.seas.harvard.edu) -output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") - (search-forward \"Click/Enter to show.\") - (button-activate (button-at (point))) - (search-backward \"Click/Enter to hide.\") - (button-activate (button-at (point))) - (princ (buffer-string))") -expected=$(cat $EXPECTED/notmuch-show-thread-maildir-storage) -test_expect_equal "$output" "$expected" +test_emacs "(notmuch-show \"$maildir_storage_thread\") + (search-forward \"Click/Enter to show.\") + (button-activate (button-at (point))) + (search-backward \"Click/Enter to hide.\") + (button-activate (button-at (point))) + (princ (buffer-string))" >OUTPUT +test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage test_done diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage b/test/emacs.expected-output/notmuch-show-thread-maildir-storage index 241b5b7..8ba64b2 100644 --- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage +++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage @@ -212,3 +212,4 @@ http://notmuchmail.org/mailman/listinfo/notmuch Happy hacking, -Carl + -- 1.7.4.4 _______________________________________________ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch