diff options
| author | Carl Worth <cworth@cworth.org> | 2010-10-28 11:45:50 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2010-10-28 11:45:50 -0700 |
| commit | 4884f5496caa2cdc8749c5eefbdc264373403f22 (patch) | |
| tree | 8a47fcc6d46dda08d4dc4ca0c205cbdfa9c4bfc5 /test | |
| parent | 294b6a67c1461f41ae331e5f7ea3cd07488cb3c2 (diff) | |
test: Avoid using unreliable, hard-coded thread ID values in test suite.
Some recently-added tests used hard-coded thread ID values in search
specifications. This is unreliable since the thread IDs depend on the
order in which "notmuch new" encounters new files, (which in turn can
depend on inode ordering within the filesystem).
Fix these by using the new "notmuch search --output=threads" to find the
correct thread IDs given a hard-coded (but reliable) message ID.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/emacs | 30 | ||||
| -rw-r--r-- | test/emacs.expected-output/notmuch-show-thread-maildir-storage (renamed from test/emacs.expected-output/notmuch-show-thread-9) | 0 |
2 files changed, 16 insertions, 14 deletions
@@ -22,8 +22,9 @@ output=$(test_emacs '(notmuch-hello) (goto-char (point-min)) (re-search-forward test_expect_equal_failure "$output" "$expected" test_begin_subtest "Basic notmuch-show view in emacs" -output=$(test_emacs '(notmuch-show "thread:0000000000000009") (message (buffer-string))' 2>&1) -expected=$(cat $EXPECTED/notmuch-show-thread-9) +maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu) +output=$(test_emacs "(notmuch-show \"$maildir_storage_thread\") (message (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" @@ -31,24 +32,25 @@ output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (goto-char test_expect_equal "$output" "$expected" test_begin_subtest "Add tag from search view" -test_emacs '(notmuch-search "thread:0000000000000001") (notmuch-test-wait) (notmuch-search-add-tag "tag-from-search-view")' -output=$(notmuch search thread:0000000000000001) -test_expect_equal "$output" "thread:0000000000000001 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-search-view unread)" +os_x_darwin_thread=$(notmuch search --output=threads id:ddd65cda0911171950o4eea4389v86de9525e46052d3@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_begin_subtest "Remove tag from search view" -test_emacs '(notmuch-search "thread:0000000000000001") (notmuch-test-wait) (notmuch-search-remove-tag "tag-from-search-view")' -output=$(notmuch search thread:0000000000000001) -test_expect_equal "$output" "thread:0000000000000001 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)" +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_begin_subtest "Add tag from notmuch-show view" -test_emacs '(notmuch-show "thread:0000000000000001") (notmuch-show-add-tag "tag-from-show-view")' -output=$(notmuch search thread:0000000000000001) -test_expect_equal "$output" "thread:0000000000000001 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-show-view unread)" +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_begin_subtest "Remove tag from notmuch-show view" -test_emacs '(notmuch-show "thread:0000000000000001") (notmuch-show-remove-tag "tag-from-show-view")' -output=$(notmuch search thread:0000000000000001) -test_expect_equal "$output" "thread:0000000000000001 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)" +test_emacs "(notmuch-show \"$os_x_darwin_thread\") (notmuch-show-remove-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 unread)" test_begin_subtest "Message with .. in Message-Id:" add_message [id]=123..456@example '[subject]="Message with .. in Message-Id"' diff --git a/test/emacs.expected-output/notmuch-show-thread-9 b/test/emacs.expected-output/notmuch-show-thread-maildir-storage index 8f18afd..8f18afd 100644 --- a/test/emacs.expected-output/notmuch-show-thread-9 +++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage |