[PATCH 3/4] test: add 'Emacs' prereq to 'emacs' tests
Signed-off-by: Pieter Praet --- test/emacs | 40 +++- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/test/emacs b/test/emacs index 3264bf2..011deac 100755 --- a/test/emacs +++ b/test/emacs @@ -2,6 +2,12 @@ test_description="emacs interface" . test-lib.sh +# Emacs is a prereq. +if test_expect_success "prereq: Emacs is present" "which emacs"; then +test_set_prereq EMACS +fi + + EXPECTED=../emacs.expected-output add_email_corpus @@ -9,64 +15,64 @@ 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_expect_equal EMACS "$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) (princ (buffer-string))') expected=$(cat $EXPECTED/notmuch-hello-with-empty) -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$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) (princ (buffer-string))') expected=$(cat $EXPECTED/notmuch-hello-no-saved-searches) -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$output" "$expected" 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_expect_equal EMACS "$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) (princ (buffer-string))') expected=$(cat $EXPECTED/notmuch-hello-view-inbox) -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$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\") (princ (buffer-string))") expected=$(cat $EXPECTED/notmuch-show-thread-maildir-storage) -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$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) (princ (buffer-string))') -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$output" "$expected" test_begin_subtest "Add tag from search view" os_x_darwin_thread=$(notmuch search --output=threads id:ddd65cda0911171950o4eea4389v86de9525e46052d3 at mail.gmail.com) test_emacs "(notmuch-search \"$os_x_darwin_thread\") (notmuch-test-wait) (notmuch-search-add-tag \"tag-from-search-view\")" output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) -test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-search-view unread)" +test_expect_equal EMACS "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-search-view unread)" test_begin_subtest "Remove tag from search view" test_emacs "(notmuch-search \"$os_x_darwin_thread\") (notmuch-test-wait) (notmuch-search-remove-tag \"tag-from-search-view\")" output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) -test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)" +test_expect_equal EMACS "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)" test_begin_subtest "Add tag from notmuch-show view" test_emacs "(notmuch-show \"$os_x_darwin_thread\") (notmuch-show-add-tag \"tag-from-show-view\")" output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) -test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-show-view unread)" +test_expect_equal EMACS "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-show-view unread)" test_begin_subtest "Remove tag from notmuch-show view" test_emacs "(notm
[PATCH 3/4] test: add 'Emacs' prereq to 'emacs' tests
Signed-off-by: Pieter Praet --- test/emacs | 40 +++- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/test/emacs b/test/emacs index 3264bf2..011deac 100755 --- a/test/emacs +++ b/test/emacs @@ -2,6 +2,12 @@ test_description="emacs interface" . test-lib.sh +# Emacs is a prereq. +if test_expect_success "prereq: Emacs is present" "which emacs"; then +test_set_prereq EMACS +fi + + EXPECTED=../emacs.expected-output add_email_corpus @@ -9,64 +15,64 @@ 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_expect_equal EMACS "$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) (princ (buffer-string))') expected=$(cat $EXPECTED/notmuch-hello-with-empty) -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$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) (princ (buffer-string))') expected=$(cat $EXPECTED/notmuch-hello-no-saved-searches) -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$output" "$expected" 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_expect_equal EMACS "$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) (princ (buffer-string))') expected=$(cat $EXPECTED/notmuch-hello-view-inbox) -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$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\") (princ (buffer-string))") expected=$(cat $EXPECTED/notmuch-show-thread-maildir-storage) -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$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) (princ (buffer-string))') -test_expect_equal "$output" "$expected" +test_expect_equal EMACS "$output" "$expected" test_begin_subtest "Add tag from search view" os_x_darwin_thread=$(notmuch search --output=threads id:ddd65cda0911171950o4eea4389v86de9525e4605...@mail.gmail.com) test_emacs "(notmuch-search \"$os_x_darwin_thread\") (notmuch-test-wait) (notmuch-search-add-tag \"tag-from-search-view\")" output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) -test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-search-view unread)" +test_expect_equal EMACS "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-search-view unread)" test_begin_subtest "Remove tag from search view" test_emacs "(notmuch-search \"$os_x_darwin_thread\") (notmuch-test-wait) (notmuch-search-remove-tag \"tag-from-search-view\")" output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) -test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)" +test_expect_equal EMACS "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)" test_begin_subtest "Add tag from notmuch-show view" test_emacs "(notmuch-show \"$os_x_darwin_thread\") (notmuch-show-add-tag \"tag-from-show-view\")" output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize) -test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-show-view unread)" +test_expect_equal EMACS "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-show-view unread)" test_begin_subtest "Remove tag from notmuch-show view" test_emacs