debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

pick: rename test outputs from pick to tree

Browse source 
Rename all the test output files to tree rather than pick, move the
containing directory to a tree.expected-output and fix up the
references in the test.
This commit is contained in:
Mark Walters 2013-10-26 23:02:07 +01:00 committed by David Bremner
parent e265a67c55
commit dae09c690b
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/notmuch-pick/run-tests.sh
View file

@ -8,7 +8,7 @@ fail() {
} }
TESTS="emacs-pick" TESTS="emacs-pick"
TESTFILES="$TESTS pick.expected-output" TESTFILES="$TESTS tree.expected-output"
export PICK_DIR="`cd \`dirname "$0"\` && pwd`" export PICK_DIR="`cd \`dirname "$0"\` && pwd`"
PICK_TEST_DIR="$PICK_DIR/test" PICK_TEST_DIR="$PICK_DIR/test"

22
contrib/notmuch-pick/test/emacs-pick
View file

@ -3,7 +3,7 @@
test_description="emacs tree view interface" test_description="emacs tree view interface"
. test-lib.sh . test-lib.sh
EXPECTED=$TEST_DIRECTORY/pick.expected-output EXPECTED=$TEST_DIRECTORY/tree.expected-output
add_email_corpus add_email_corpus
test_begin_subtest "Do we have emacs" test_begin_subtest "Do we have emacs"
@ -21,7 +21,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
(notmuch-test-wait) (notmuch-test-wait)
(test-output) (test-output)
(delete-other-windows)' (delete-other-windows)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
test_begin_subtest "Refreshed notmuch-tree view in emacs" test_begin_subtest "Refreshed notmuch-tree view in emacs"
test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'") test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
@ -32,7 +32,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
(notmuch-test-wait) (notmuch-test-wait)
(test-output) (test-output)
(delete-other-windows)' (delete-other-windows)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
# In the following tag tests we make sure the display is updated # In the following tag tests we make sure the display is updated
# correctly and, in a separate test, that the database is updated # correctly and, in a separate test, that the database is updated
@ -47,7 +47,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
(notmuch-tree-tag (list "+test_tag")) (notmuch-tree-tag (list "+test_tag"))
(test-output) (test-output)
(delete-other-windows)' (delete-other-windows)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-tagged test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-tagged
test_begin_subtest "Tag message in notmuch tree view (database)" test_begin_subtest "Tag message in notmuch tree view (database)"
output=$(notmuch search --output=messages 'tag:test_tag') output=$(notmuch search --output=messages 'tag:test_tag')
@ -62,7 +62,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
(notmuch-tree-tag (list "-test_tag")) (notmuch-tree-tag (list "-test_tag"))
(test-output) (test-output)
(delete-other-windows)' (delete-other-windows)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
test_begin_subtest "Untag message in notmuch tree view (database)" test_begin_subtest "Untag message in notmuch tree view (database)"
output=$(notmuch search --output=messages 'tag:test_tag') output=$(notmuch search --output=messages 'tag:test_tag')
@ -78,7 +78,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
(notmuch-tree-tag-thread (list "+test_thread_tag")) (notmuch-tree-tag-thread (list "+test_thread_tag"))
(test-output) (test-output)
(delete-other-windows)' (delete-other-windows)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-thread-tagged test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-thread-tagged
test_begin_subtest "Tag message in notmuch tree view (database)" test_begin_subtest "Tag message in notmuch tree view (database)"
output=$(notmuch search --output=messages 'tag:test_thread_tag') output=$(notmuch search --output=messages 'tag:test_thread_tag')
@ -101,7 +101,7 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
(notmuch-tree-tag-thread (list "-test_thread_tag")) (notmuch-tree-tag-thread (list "-test_thread_tag"))
(test-output) (test-output)
(delete-other-windows)' (delete-other-windows)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
test_begin_subtest "Untag message in notmuch tree view (database)" test_begin_subtest "Untag message in notmuch tree view (database)"
output=$(notmuch search --output=messages 'tag:test_thread_tag') output=$(notmuch search --output=messages 'tag:test_thread_tag')
@ -117,7 +117,7 @@ test_emacs '(notmuch-hello)
(notmuch-test-wait) (notmuch-test-wait)
(test-output) (test-output)
(delete-other-windows)' (delete-other-windows)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
test_begin_subtest "Tree view of a single thread (from search)" test_begin_subtest "Tree view of a single thread (from search)"
test_emacs '(notmuch-hello) test_emacs '(notmuch-hello)
@ -129,7 +129,7 @@ test_emacs '(notmuch-hello)
(notmuch-test-wait) (notmuch-test-wait)
(test-output) (test-output)
(delete-other-windows)' (delete-other-windows)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
test_begin_subtest "Tree view of a single thread (from show)" test_begin_subtest "Tree view of a single thread (from show)"
test_emacs '(notmuch-hello) test_emacs '(notmuch-hello)
@ -142,7 +142,7 @@ test_emacs '(notmuch-hello)
(notmuch-test-wait) (notmuch-test-wait)
(test-output) (test-output)
(delete-other-windows)' (delete-other-windows)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-single-thread test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
test_begin_subtest "Message window of tree view" test_begin_subtest "Message window of tree view"
test_emacs '(notmuch-hello) test_emacs '(notmuch-hello)
@ -157,7 +157,7 @@ test_emacs '(notmuch-hello)
(test-output) (test-output)
(delete-other-windows)' (delete-other-windows)'
cp OUTPUT /tmp/mjwout cp OUTPUT /tmp/mjwout
test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-show-window test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-show-window
test_begin_subtest "Stash id" test_begin_subtest "Stash id"
output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'") output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")

0
contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-show-window → contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window
View file

0
contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-single-thread → contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread
View file

0
contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox → contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox
View file

0
contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-tagged → contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged
View file

0
contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-thread-tagged → contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged
View file