[PATCH 3/4] test: add 'Emacs' prereq to dependent 'emacs' tests
Adds a new test that checks for the presence of 'emacs',
and adds that test as a prereq to all subsequent tests
that rely on Emacs.
This causes tests with unmet dependencies to be skipped.
---
test/emacs | 65 ---
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/test/emacs b/test/emacs
index 0303d7d..8b1e5e4 100755
--- a/test/emacs
+++ b/test/emacs
@@ -3,6 +3,11 @@
test_description="emacs interface"
. test-lib.sh
+# Emacs is a prereq.
+test_expect_success "prereq: Emacs is present" "which emacs" \
+&& test_set_prereq EMACS
+
+
EXPECTED=$TEST_DIRECTORY/emacs.expected-output
add_email_corpus
@@ -10,7 +15,7 @@ add_email_corpus
test_begin_subtest "Basic notmuch-hello view in emacs"
test_emacs '(notmuch-hello)
(test-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello
+test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello
test_begin_subtest "Saved search with 0 results"
test_emacs '(let ((notmuch-show-empty-saved-searches t)
@@ -20,20 +25,20 @@ test_emacs '(let ((notmuch-show-empty-saved-searches t)
("empty" . "tag:doesnotexist"
(notmuch-hello)
(test-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-with-empty
+test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello-with-empty
test_begin_subtest "No saved searches displayed (all with 0 results)"
test_emacs '(let ((notmuch-saved-searches
'\''(("empty" . "tag:doesnotexist"
(notmuch-hello)
(test-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-no-saved-searches
+test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello-no-saved-searches
test_begin_subtest "Basic notmuch-search view in emacs"
test_emacs '(notmuch-search "tag:inbox")
(notmuch-test-wait)
(test-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-search-tag-inbox
+test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-search-tag-inbox
test_begin_subtest "Navigation of notmuch-hello to search results"
test_emacs '(notmuch-hello)
@@ -42,13 +47,13 @@ test_emacs '(notmuch-hello)
(widget-button-press (point))
(notmuch-test-wait)
(test-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-view-inbox
+test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello-view-inbox
test_begin_subtest "Basic notmuch-show view in emacs"
maildir_storage_thread=$(notmuch search --output=threads
id:20091117190054.GU3165 at dottiness.seas.harvard.edu)
test_emacs "(notmuch-show \"$maildir_storage_thread\")
(test-output)"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
+test_expect_equal_file EMACS OUTPUT
$EXPECTED/notmuch-show-thread-maildir-storage
test_begin_subtest "notmuch-show for message with invalid From"
add_message "[subject]=\"message-with-invalid-from\"" \
@@ -64,7 +69,7 @@ Date: Tue, 05 Jan 2001 15:43:57 -
This is just a test message (#1)
EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EMACS OUTPUT EXPECTED
test_begin_subtest "Navigation of notmuch-search to thread view"
test_emacs '(notmuch-search "tag:inbox")
@@ -74,7 +79,7 @@ test_emacs '(notmuch-search "tag:inbox")
(notmuch-search-show-thread)
(notmuch-test-wait)
(test-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
+test_expect_equal_file EMACS OUTPUT
$EXPECTED/notmuch-show-thread-maildir-storage
test_begin_subtest "Add tag from search view"
os_x_darwin_thread=$(notmuch search --output=threads
id:ddd65cda0911171950o4eea4389v86de9525e46052d3 at mail.gmail.com)
@@ -82,26 +87,26 @@ 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)"
[PATCH 3/4] test: add 'Emacs' prereq to dependent 'emacs' tests
Adds a new test that checks for the presence of 'emacs', and adds that test as a prereq to all subsequent tests that rely on Emacs. This causes tests with unmet dependencies to be skipped. --- test/emacs | 65 --- 1 files changed, 35 insertions(+), 30 deletions(-) diff --git a/test/emacs b/test/emacs index 0303d7d..8b1e5e4 100755 --- a/test/emacs +++ b/test/emacs @@ -3,6 +3,11 @@ test_description=emacs interface . test-lib.sh +# Emacs is a prereq. +test_expect_success prereq: Emacs is present which emacs \ + test_set_prereq EMACS + + EXPECTED=$TEST_DIRECTORY/emacs.expected-output add_email_corpus @@ -10,7 +15,7 @@ add_email_corpus test_begin_subtest Basic notmuch-hello view in emacs test_emacs '(notmuch-hello) (test-output)' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello +test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello test_begin_subtest Saved search with 0 results test_emacs '(let ((notmuch-show-empty-saved-searches t) @@ -20,20 +25,20 @@ test_emacs '(let ((notmuch-show-empty-saved-searches t) (empty . tag:doesnotexist (notmuch-hello) (test-output))' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-with-empty +test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello-with-empty test_begin_subtest No saved searches displayed (all with 0 results) test_emacs '(let ((notmuch-saved-searches '\''((empty . tag:doesnotexist (notmuch-hello) (test-output))' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-no-saved-searches +test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello-no-saved-searches test_begin_subtest Basic notmuch-search view in emacs test_emacs '(notmuch-search tag:inbox) (notmuch-test-wait) (test-output)' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-search-tag-inbox +test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-search-tag-inbox test_begin_subtest Navigation of notmuch-hello to search results test_emacs '(notmuch-hello) @@ -42,13 +47,13 @@ test_emacs '(notmuch-hello) (widget-button-press (point)) (notmuch-test-wait) (test-output)' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-view-inbox +test_expect_equal_file EMACS 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) test_emacs (notmuch-show \$maildir_storage_thread\) (test-output) -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage +test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage test_begin_subtest notmuch-show for message with invalid From add_message [subject]=\message-with-invalid-from\ \ @@ -64,7 +69,7 @@ Date: Tue, 05 Jan 2001 15:43:57 - This is just a test message (#1) EOF -test_expect_equal_file OUTPUT EXPECTED +test_expect_equal_file EMACS OUTPUT EXPECTED test_begin_subtest Navigation of notmuch-search to thread view test_emacs '(notmuch-search tag:inbox) @@ -74,7 +79,7 @@ test_emacs '(notmuch-search tag:inbox) (notmuch-search-show-thread) (notmuch-test-wait) (test-output)' -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage +test_expect_equal_file EMACS 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) @@ -82,26 +87,26 @@ 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
[PATCH 3/4] test: add 'Emacs' prereq to dependent 'emacs' tests
Adds a new test that checks for the presence of 'emacs',
and adds that test as a prereq to all subsequent tests
that rely on Emacs.
This causes tests with unmet dependencies to be skipped.
Signed-off-by: Pieter Praet
---
test/emacs | 43 ---
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/test/emacs b/test/emacs
index da8ba68..10138a6 100755
--- a/test/emacs
+++ b/test/emacs
@@ -2,65 +2,70 @@
test_description="emacs interface"
. test-lib.sh
+# Emacs is a prereq.
+test_expect_success "prereq: Emacs is present" "which emacs" \
+&& test_set_prereq EMACS
+
+
EXPECTED=../emacs.expected-output
add_email_corpus
test_begin_subtest "Basic notmuch-hello view in emacs"
test_emacs '(notmuch-hello) (princ (buffer-string))' >OUTPUT
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello
+test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello
test_begin_subtest "Saved search with 0 results"
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_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello-with-empty
test_begin_subtest "No saved searches displayed (all with 0 results)"
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_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello-no-saved-searches
test_begin_subtest "Basic notmuch-search view in emacs"
test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (princ
(buffer-string))' >OUTPUT
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-search-tag-inbox
+test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-search-tag-inbox
test_begin_subtest "Navigation of notmuch-hello to search results"
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_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello-view-inbox
test_begin_subtest "Basic notmuch-show view in emacs"
maildir_storage_thread=$(notmuch search --output=threads
id:20091117190054.GU3165 at dottiness.seas.harvard.edu)
test_emacs "(notmuch-show \"$maildir_storage_thread\") (princ
(buffer-string))" >OUTPUT
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
+test_expect_equal_file EMACS OUTPUT
$EXPECTED/notmuch-show-thread-maildir-storage
test_begin_subtest "Navigation of notmuch-search to thread view"
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_expect_equal_file EMACS OUTPUT
$EXPECTED/notmuch-show-thread-maildir-storage
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
[PATCH 3/4] test: add 'Emacs' prereq to dependent 'emacs' tests
Adds a new test that checks for the presence of 'emacs', and adds that test as a prereq to all subsequent tests that rely on Emacs. This causes tests with unmet dependencies to be skipped. Signed-off-by: Pieter Praet pie...@praet.org --- test/emacs | 43 --- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/test/emacs b/test/emacs index da8ba68..10138a6 100755 --- a/test/emacs +++ b/test/emacs @@ -2,65 +2,70 @@ test_description=emacs interface . test-lib.sh +# Emacs is a prereq. +test_expect_success prereq: Emacs is present which emacs \ + test_set_prereq EMACS + + EXPECTED=../emacs.expected-output add_email_corpus test_begin_subtest Basic notmuch-hello view in emacs test_emacs '(notmuch-hello) (princ (buffer-string))' OUTPUT -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello +test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello test_begin_subtest Saved search with 0 results 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_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello-with-empty test_begin_subtest No saved searches displayed (all with 0 results) 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_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-hello-no-saved-searches test_begin_subtest Basic notmuch-search view in emacs test_emacs '(notmuch-search tag:inbox) (notmuch-test-wait) (princ (buffer-string))' OUTPUT -test_expect_equal_file OUTPUT $EXPECTED/notmuch-search-tag-inbox +test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-search-tag-inbox test_begin_subtest Navigation of notmuch-hello to search results 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_expect_equal_file EMACS 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) test_emacs (notmuch-show \$maildir_storage_thread\) (princ (buffer-string)) OUTPUT -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage +test_expect_equal_file EMACS OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage test_begin_subtest Navigation of notmuch-search to thread view 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_expect_equal_file EMACS 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) 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
