From: Carl Worth <cworth@cworth.org>
Date: Wed, 8 Dec 2010 00:35:47 +0000 (-0800)
Subject: Update test suite for 7 tests that were recently fixed.
X-Git-Tag: debian/0.6_254~224
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=e2556542325a74bb0284ae21764c58249dd7bef7

Update test suite for 7 tests that were recently fixed.

These tests had been broken, but were fixed by the preceding commit,
so update the test suite to print PASS rather than FIXED for these.
---

diff --git a/test/author-order b/test/author-order
index 2ddc91c7..d1149922 100755
--- a/test/author-order
+++ b/test/author-order
@@ -19,11 +19,11 @@ test_expect_equal "$output" "Added 1 new message to the database."
 
 test_begin_subtest "Searching when all three messages match"
 output=$(notmuch search findme | notmuch_search_sanitize)
-test_expect_equal_failure "$output" "thread:XXX   2000-01-01 [3/3] User, User1, User2; author-reorder-threadtest (inbox unread)"
+test_expect_equal "$output" "thread:XXX   2000-01-01 [3/3] User, User1, User2; author-reorder-threadtest (inbox unread)"
 
 test_begin_subtest "Searching when two messages match"
 output=$(notmuch search User1 or User2 | notmuch_search_sanitize)
-test_expect_equal_failure "$output" "thread:XXX   2000-01-01 [2/3] User1, User2| User; author-reorder-threadtest (inbox unread)"
+test_expect_equal "$output" "thread:XXX   2000-01-01 [2/3] User1, User2| User; author-reorder-threadtest (inbox unread)"
 
 test_begin_subtest "Searching when only one message matches"
 output=$(notmuch search User2 | notmuch_search_sanitize)
@@ -40,7 +40,7 @@ test_expect_equal "$output" "Added 1 new message to the database."
 
 test_begin_subtest "Searching when all four messages match"
 output=$(notmuch search findme | notmuch_search_sanitize)
-test_expect_equal_failure "$output" "thread:XXX   2000-01-01 [4/4] User, User1, User2; author-reorder-threadtest (inbox unread)"
+test_expect_equal "$output" "thread:XXX   2000-01-01 [4/4] User, User1, User2; author-reorder-threadtest (inbox unread)"
 
 test_begin_subtest "Adding non-monotonic child message"
 generate_message [body]=findme "[in-reply-to]=\<new-parent-id\>" [subject]=author-reorder-threadtest '[from]="User0 <user0@example.com>"' '[date]="Sat, 01 Jan 2000 11:00:00 -0000"'
@@ -49,10 +49,10 @@ test_expect_equal "$output" "Added 1 new message to the database."
 
 test_begin_subtest "Searching non-monotonic messages (oldest-first)"
 output=$(notmuch search --sort=oldest-first findme | notmuch_search_sanitize)
-test_expect_equal_failure "$output" "thread:XXX   2000-01-01 [5/5] User0, User, User1, User2; author-reorder-threadtest (inbox unread)"
+test_expect_equal "$output" "thread:XXX   2000-01-01 [5/5] User0, User, User1, User2; author-reorder-threadtest (inbox unread)"
 
 test_begin_subtest "Searching non-monotonic messages (newest-first)"
 output=$(notmuch search --sort=newest-first findme | notmuch_search_sanitize)
-test_expect_equal_failure "$output" "thread:XXX   2000-01-01 [5/5] User0, User, User1, User2; author-reorder-threadtest (inbox unread)"
+test_expect_equal "$output" "thread:XXX   2000-01-01 [5/5] User0, User, User1, User2; author-reorder-threadtest (inbox unread)"
 
 test_done
diff --git a/test/emacs b/test/emacs
index fd5ae07f..75dec89c 100755
--- a/test/emacs
+++ b/test/emacs
@@ -24,12 +24,12 @@ test_expect_equal "$output" "$expected"
 test_begin_subtest "Basic notmuch-search view in emacs"
 output=$(test_emacs '(notmuch-search "tag:inbox") (notmuch-test-wait) (message (buffer-string))' 2>&1)
 expected=$(cat $EXPECTED/notmuch-search-tag-inbox)
-test_expect_equal_failure "$output" "$expected"
+test_expect_equal "$output" "$expected"
 
 test_begin_subtest "Navigation of notmuch-hello to search results"
 output=$(test_emacs '(notmuch-hello) (goto-char (point-min)) (re-search-forward "inbox") (widget-button-press (point)) (notmuch-test-wait) (message (buffer-string))' 2>&1)
 expected=$(cat $EXPECTED/notmuch-hello-view-inbox)
-test_expect_equal_failure "$output" "$expected"
+test_expect_equal "$output" "$expected"
 
 test_begin_subtest "Basic notmuch-show view in emacs"
 maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)