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

test: Move tests from emacs to emacs-show

Browse source 
This requires changing the contents of the crypto tests, as one thread
that was marked read by the earlier tests in test/emacs is no longer
marked read.

This moves tests for:

- 09d19ac "test: emacs: toggle eliding of non-matching messages in
   `notmuch-show'", which should have actually read: "test: emacs:
   toggle processing of cryptographic MIME parts in `notmuch-show'".
   See commit 19ec74c5.

- 5ea1dbe "test: emacs: toggle eliding of non-matching messages in
  `notmuch-show'"

- 345faab "test: emacs: toggle thread content indentation in
  `notmuch-show'"

Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com>
This commit is contained in:
Ethan Glasser-Camp 2012-10-17 22:16:52 -04:00 committed by David Bremner
parent b52ee879d8
commit 518eed1ba7
7 changed files with 73 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
test/emacs
View file

@ -783,71 +783,4 @@ EOF
test_expect_equal_file OUTPUT EXPECTED test_expect_equal_file OUTPUT EXPECTED
test_begin_subtest "don't process cryptographic MIME parts"
test_emacs '(let ((notmuch-crypto-process-mime nil))
(notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu")
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-off
test_begin_subtest "process cryptographic MIME parts"
test_emacs '(let ((notmuch-crypto-process-mime t))
(notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu")
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on
test_begin_subtest "process cryptographic MIME parts (w/ notmuch-show-toggle-process-crypto)"
test_emacs '(let ((notmuch-crypto-process-mime nil))
(notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu")
(notmuch-show-toggle-process-crypto)
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on
test_begin_subtest "notmuch-show: don't elide non-matching messages"
test_emacs '(let ((notmuch-show-only-matching-messages nil))
(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
(notmuch-test-wait)
(notmuch-search-show-thread)
(notmuch-test-wait)
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-off
test_begin_subtest "notmuch-show: elide non-matching messages"
test_emacs '(let ((notmuch-show-only-matching-messages t))
(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
(notmuch-test-wait)
(notmuch-search-show-thread)
(notmuch-test-wait)
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on
test_begin_subtest "notmuch-show: elide non-matching messages (w/ notmuch-show-toggle-elide-non-matching)"
test_emacs '(let ((notmuch-show-only-matching-messages nil))
(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
(notmuch-test-wait)
(notmuch-search-show-thread)
(notmuch-test-wait)
(notmuch-show-toggle-elide-non-matching)
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on
test_begin_subtest "notmuch-show: elide non-matching messages (w/ prefix arg to notmuch-show)"
test_emacs '(let ((notmuch-show-only-matching-messages nil))
(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
(notmuch-test-wait)
(let ((current-prefix-arg t))
(notmuch-search-show-thread))
(notmuch-test-wait)
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on
test_begin_subtest "notmuch-show: disable indentation of thread content (w/ notmuch-show-toggle-thread-indentation)"
test_emacs '(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
(notmuch-test-wait)
(notmuch-search-show-thread)
(notmuch-test-wait)
(notmuch-show-toggle-thread-indentation)
(test-visible-output)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-indent-thread-content-off
test_done test_done

71
test/emacs-show
View file

@ -3,6 +3,10 @@
test_description="emacs notmuch-show view" test_description="emacs notmuch-show view"
. test-lib.sh . test-lib.sh
EXPECTED=$TEST_DIRECTORY/emacs-show.expected-output
add_email_corpus
test_begin_subtest "Hiding Original Message region at beginning of a message" test_begin_subtest "Hiding Original Message region at beginning of a message"
message_id='OriginalMessageHiding.1@notmuchmail.org' message_id='OriginalMessageHiding.1@notmuchmail.org'
add_message \ add_message \
@ -36,4 +40,71 @@ test_begin_subtest "Bare subject #3"
output=$(test_emacs '(notmuch-show-strip-re "the cure: fix the regexp")') output=$(test_emacs '(notmuch-show-strip-re "the cure: fix the regexp")')
test_expect_equal "$output" '"the cure: fix the regexp"' test_expect_equal "$output" '"the cure: fix the regexp"'
test_begin_subtest "don't process cryptographic MIME parts"
test_emacs '(let ((notmuch-crypto-process-mime nil))
(notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu")
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-off
test_begin_subtest "process cryptographic MIME parts"
test_emacs '(let ((notmuch-crypto-process-mime t))
(notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu")
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on
test_begin_subtest "process cryptographic MIME parts (w/ notmuch-show-toggle-process-crypto)"
test_emacs '(let ((notmuch-crypto-process-mime nil))
(notmuch-show "id:20091117203301.GV3165@dottiness.seas.harvard.edu")
(notmuch-show-toggle-process-crypto)
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on
test_begin_subtest "notmuch-show: don't elide non-matching messages"
test_emacs '(let ((notmuch-show-only-matching-messages nil))
(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
(notmuch-test-wait)
(notmuch-search-show-thread)
(notmuch-test-wait)
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-off
test_begin_subtest "notmuch-show: elide non-matching messages"
test_emacs '(let ((notmuch-show-only-matching-messages t))
(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
(notmuch-test-wait)
(notmuch-search-show-thread)
(notmuch-test-wait)
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on
test_begin_subtest "notmuch-show: elide non-matching messages (w/ notmuch-show-toggle-elide-non-matching)"
test_emacs '(let ((notmuch-show-only-matching-messages nil))
(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
(notmuch-test-wait)
(notmuch-search-show-thread)
(notmuch-test-wait)
(notmuch-show-toggle-elide-non-matching)
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on
test_begin_subtest "notmuch-show: elide non-matching messages (w/ prefix arg to notmuch-show)"
test_emacs '(let ((notmuch-show-only-matching-messages nil))
(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
(notmuch-test-wait)
(let ((current-prefix-arg t))
(notmuch-search-show-thread))
(notmuch-test-wait)
(test-visible-output))'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on
test_begin_subtest "notmuch-show: disable indentation of thread content (w/ notmuch-show-toggle-thread-indentation)"
test_emacs '(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
(notmuch-test-wait)
(notmuch-search-show-thread)
(notmuch-test-wait)
(notmuch-show-toggle-thread-indentation)
(test-visible-output)'
test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-indent-thread-content-off
test_done test_done

0
test/emacs.expected-output/notmuch-show-elide-non-matching-messages-off → test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off
View file

0
test/emacs.expected-output/notmuch-show-elide-non-matching-messages-on → test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on
View file

0
test/emacs.expected-output/notmuch-show-indent-thread-content-off → test/emacs-show.expected-output/notmuch-show-indent-thread-content-off
View file

2
test/emacs.expected-output/notmuch-show-process-crypto-mime-parts-off → test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off
View file

@ -1,4 +1,4 @@
Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed) Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed unread)
Subject: [notmuch] Working with Maildir storage? Subject: [notmuch] Working with Maildir storage?
Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread) Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread)
Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed) Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed)

2
test/emacs.expected-output/notmuch-show-process-crypto-mime-parts-on → test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-on
View file

@ -1,4 +1,4 @@
Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed) Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed unread)
Subject: [notmuch] Working with Maildir storage? Subject: [notmuch] Working with Maildir storage?
Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread) Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread)
Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed) Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed)