aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/emacs
diff options
context:
space:
mode:
authorGravatar Austin Clements <amdragon@MIT.EDU>2012-09-29 13:55:12 -0400
committerGravatar David Bremner <bremner@debian.org>2012-09-30 11:40:22 -0300
commit61a9448b58ca1320d97cfe580155cf23b5b9ad62 (patch)
tree70dd9b4dd093c76a488cce2437d9a6f49997abe9 /test/emacs
parent1ecacab28fe10abf367ce4d6e4bac4a0642861e9 (diff)
test: Clear test-output output file before running Emacs tests
Most Emacs tests end with a call to (test-output), which saves the buffer to a filed called OUTPUT. Previously, if the test code failed with an exception before this call, the test framework would then compare against the OUTPUT file from the last Emacs test, resulting in confusing diffs. This requires one tweak to an emacs test that made two calls to test_emacs and expected an OUTPUT file from the first call. We simply reverse the order of the test_emacs calls.
Diffstat (limited to 'test/emacs')
-rwxr-xr-xtest/emacs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/emacs b/test/emacs
index 5d118b67..174a9ac9 100755
--- a/test/emacs
+++ b/test/emacs
@@ -653,6 +653,8 @@ test_expect_equal "$(cat OUTPUT)" "thread:XXX"
test_begin_subtest 'notmuch-show-advance-and-archive with invisible signature'
message1='id:20091118010116.GC25380@dottiness.seas.harvard.edu'
message2='id:1258491078-29658-1-git-send-email-dottedmag@dottedmag.net'
+test_emacs "(notmuch-show \"$message2\")
+ (test-output \"EXPECTED\")"
test_emacs "(notmuch-search \"$message1 or $message2\")
(notmuch-test-wait)
(notmuch-search-show-thread)
@@ -660,8 +662,6 @@ test_emacs "(notmuch-search \"$message1 or $message2\")
(redisplay)
(notmuch-show-advance-and-archive)
(test-output)"
-test_emacs "(notmuch-show \"$message2\")
- (test-output \"EXPECTED\")"
test_expect_equal_file OUTPUT EXPECTED
test_begin_subtest "Refresh show buffer"