[PATCH 1/2] test: standardize argument order to test_expect_equal_file

classic Classic list List threaded Threaded
6 messages Options
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] test: standardize argument order to test_expect_equal_file

It is annoying to debug failing tests when the interpretation of the
diffs is reversed for some tests.
---
 test/T080-search.sh                    |  2 +-
 test/T090-search-output.sh             | 36 +++++++--------
 test/T095-address.sh                   | 26 +++++------
 test/T190-multipart.sh                 | 46 +++++++++----------
 test/T240-dump-restore.sh              |  2 +-
 test/T310-emacs.sh                     | 80 +++++++++++++++++-----------------
 test/T320-emacs-large-search-buffer.sh |  2 +-
 test/T350-crypto.sh                    |  2 +-
 test/T370-search-folder-coherence.sh   |  2 +-
 test/T390-python.sh                    |  4 +-
 test/T395-ruby.sh                      | 10 ++---
 test/T410-argument-parsing.sh          |  2 +-
 test/T440-emacs-hello.sh               | 14 +++---
 test/T450-emacs-show.sh                | 20 ++++-----
 test/T455-emacs-charsets.sh            | 10 ++---
 test/T460-emacs-tree.sh                | 20 ++++-----
 test/T480-hex-escaping.sh              |  4 +-
 test/T500-search-date.sh               |  2 +-
 18 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/test/T080-search.sh b/test/T080-search.sh
index 6149da93..d2d71ca9 100755
--- a/test/T080-search.sh
+++ b/test/T080-search.sh
@@ -144,7 +144,7 @@ thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unr
 thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; subject search test (phrase) (inbox unread)
 thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; this phrase should not match the subject search test (inbox unread)
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Search body (utf-8):"
 add_message '[subject]="utf8-message-body-subject"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' '[body]="message body utf8: bödý"'
diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh
index a28eaf20..dccefcb7 100755
--- a/test/T090-search-output.sh
+++ b/test/T090-search-output.sh
@@ -32,7 +32,7 @@ thread:THREADID
 thread:THREADID
 thread:THREADID
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=threads --format=json"
 notmuch search --format=json --output=threads '*' | sed -e s/\".*\"/\"THREADID\"/ >OUTPUT
@@ -120,25 +120,25 @@ id:[hidden email]
 id:[hidden email]
 id:[hidden email]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=messages --duplicate=1"
 notmuch search --output=messages --duplicate=1 '*' >OUTPUT
 # reuse same EXPECTED as above
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=messages --duplicate=2"
 notmuch search --output=messages --duplicate=2 '*' >OUTPUT
 cat <<EOF >EXPECTED
 id:[hidden email]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=messages --duplicate=3"
 notmuch search --output=messages --duplicate=3 '*' >OUTPUT
 cat <<EOF >EXPECTED
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=messages --format=json"
 notmuch search --format=json --output=messages '*' >OUTPUT
@@ -196,26 +196,26 @@ cat <<EOF >EXPECTED
 "[hidden email]",
 "[hidden email]"]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=messages --format=json --duplicate=1"
 notmuch search --output=messages --format=json --duplicate=1 '*' >OUTPUT
 # reuse same EXPECTED as above
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=messages --format=json --duplicate=2"
 notmuch search --output=messages --format=json --duplicate=2 '*' >OUTPUT
 cat <<EOF >EXPECTED
 ["[hidden email]"]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=messages --format=json --duplicate=3"
 notmuch search --output=messages --format=json --duplicate=3 '*' >OUTPUT
 cat <<EOF >EXPECTED
 []
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=files"
 notmuch search --output=files '*' | notmuch_search_files_sanitize | sort >OUTPUT
@@ -274,7 +274,7 @@ MAIL_DIR/foo/new/09:2,
 MAIL_DIR/foo/new/10:2,
 MAIL_DIR/new/04:2,
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 dup1=$(notmuch search --output=files id:[hidden email] | head -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,")
 dup2=$(notmuch search --output=files id:[hidden email] | tail -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,")
@@ -335,7 +335,7 @@ MAIL_DIR/foo/cur/07:2,
 MAIL_DIR/02:2,
 MAIL_DIR/01:2,
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=files --format=json"
 notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize \
@@ -395,14 +395,14 @@ cat <<EOF | test_sort_json >EXPECTED
 "MAIL_DIR/02:2,",
 "MAIL_DIR/01:2,"]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=files --format=json --duplicate=2"
 notmuch search --format=json --output=files --duplicate=2 '*' | notmuch_search_files_sanitize >OUTPUT
 cat <<EOF >EXPECTED
 ["$dup2"]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=tags"
 notmuch search --output=tags '*' >OUTPUT
@@ -412,7 +412,7 @@ inbox
 signed
 unread
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=tags --format=json"
 notmuch search --format=json --output=tags '*' >OUTPUT
@@ -422,7 +422,7 @@ cat <<EOF >EXPECTED
 "signed",
 "unread"]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "sanitize output for quoted-printable line-breaks in author and subject"
 add_message "[subject]='two =?ISO-8859-1?Q?line=0A_subject?=
@@ -431,16 +431,16 @@ notmuch search id:"$gen_msg_id" | notmuch_search_sanitize >OUTPUT
 cat <<EOF >EXPECTED
 thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; two line  subject headers (inbox unread)
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "search for non-existent message prints nothing"
 notmuch search "no-message-matches-this" > OUTPUT
 echo -n >EXPECTED
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "search --format=json for non-existent message prints proper empty json"
 notmuch search --format=json "no-message-matches-this" > OUTPUT
 echo "[]" >EXPECTED
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_done
diff --git a/test/T095-address.sh b/test/T095-address.sh
index a194faf3..5931b147 100755
--- a/test/T095-address.sh
+++ b/test/T095-address.sh
@@ -25,12 +25,12 @@ Adrian Perez de Castro <[hidden email]>
 Israel Herraiz <[hidden email]>
 Mikhail Gusarov <[hidden email]>
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "without --output"
 notmuch address '*' >OUTPUT
 # Use EXPECTED from previous subtest
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=sender --format=json"
 notmuch address --output=sender --format=json '*' >OUTPUT
@@ -53,7 +53,7 @@ cat <<EOF >EXPECTED
 {"name": "Israel Herraiz", "address": "[hidden email]", "name-addr": "Israel Herraiz <[hidden email]>"},
 {"name": "Mikhail Gusarov", "address": "[hidden email]", "name-addr": "Mikhail Gusarov <[hidden email]>"}]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=recipients"
 notmuch address --output=recipients '*' >OUTPUT
@@ -66,7 +66,7 @@ notmuch <[hidden email]>
 Keith Packard <[hidden email]>
 Mikhail Gusarov <[hidden email]>
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=sender --output=recipients"
 notmuch address --output=sender --output=recipients '*' >OUTPUT
@@ -94,7 +94,7 @@ Adrian Perez de Castro <[hidden email]>
 Israel Herraiz <[hidden email]>
 Mikhail Gusarov <[hidden email]>
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=sender --output=count"
 notmuch address --output=sender --output=count '*' | sort -n >OUTPUT
@@ -117,7 +117,7 @@ cat <<EOF >EXPECTED
 7 Keith Packard <[hidden email]>
 12 Carl Worth <[hidden email]>
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--output=count --format=json"
 # Since the iteration order of GHashTable is not specified, we
@@ -143,7 +143,7 @@ cat <<EOF >EXPECTED
 {"name": "Rolland Santimano", "address": "[hidden email]", "name-addr": "Rolland Santimano <[hidden email]>", "count": 1}
 {"name": "Stewart Smith", "address": "[hidden email]", "name-addr": "Stewart Smith <[hidden email]>", "count": 3}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--deduplicate=no --sort=oldest-first --output=sender"
 notmuch address --deduplicate=no --sort=oldest-first --output=sender '*' >OUTPUT
@@ -201,7 +201,7 @@ Chris Wilson <[hidden email]>
 Olivier Berger <[hidden email]>
 François Boulogne <[hidden email]>
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--deduplicate=no --sort=newest-first --output=sender --output=recipients"
 notmuch address --deduplicate=no --sort=newest-first --output=sender --output=recipients path:foo/new >OUTPUT
@@ -213,7 +213,7 @@ [hidden email]
 Lars Kellogg-Stedman <[hidden email]>
 [hidden email]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--deduplicate=address --output=sender --output=recipients"
 notmuch address --deduplicate=address --output=sender --output=recipients '*' | sort >OUTPUT
@@ -238,7 +238,7 @@ Rolland Santimano <[hidden email]>
 Stewart Smith <[hidden email]>
 [hidden email]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 generate_message '[from]="Foo Bar <[hidden email]>"'
 generate_message '[from]="Foo Bar <[hidden email]>"'
@@ -266,7 +266,7 @@ Foo Bar <[hidden email]>
 [hidden email]
 [hidden email]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--deduplicate=mailbox --output=sender --output=count"
 notmuch address --deduplicate=mailbox --output=sender --output=count from:example.com | sort -n >OUTPUT
@@ -279,7 +279,7 @@ cat <<EOF >EXPECTED
 2 Foo Bar <[hidden email]>
 2 [hidden email]
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--deduplicate=address --output=sender --output=count"
 notmuch address --deduplicate=address --output=sender --output=count from:example.com | sort -n >OUTPUT
@@ -287,6 +287,6 @@ cat <<EOF >EXPECTED
 3 Baz <[hidden email]>
 7 Foo Bar <[hidden email]>
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_done
diff --git a/test/T190-multipart.sh b/test/T190-multipart.sh
index a6b155e9..12a10451 100755
--- a/test/T190-multipart.sh
+++ b/test/T190-multipart.sh
@@ -178,7 +178,7 @@ Non-text part: application/pgp-signature
  body}
  message}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=text --part=1, message body"
 notmuch show --format=text --part=1 'id:[hidden email]' >OUTPUT
@@ -217,7 +217,7 @@ Non-text part: application/pgp-signature
  part}
  part}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=text --part=2, multipart/mixed"
 notmuch show --format=text --part=2 'id:[hidden email]' >OUTPUT
@@ -251,7 +251,7 @@ And this message is signed.
  part}
  part}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=text --part=3, rfc822 part"
 notmuch show --format=text --part=3 'id:[hidden email]' >OUTPUT
@@ -275,7 +275,7 @@ This is an embedded message, with a multipart/alternative part.
  body}
  part}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=text --part=4, rfc822's multipart"
 notmuch show --format=text --part=4 'id:[hidden email]' >OUTPUT
@@ -289,7 +289,7 @@ This is an embedded message, with a multipart/alternative part.
  part}
  part}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=text --part=5, rfc822's html part"
 notmuch show --format=text --part=5 'id:[hidden email]' >OUTPUT
@@ -298,7 +298,7 @@ cat <<EOF >EXPECTED
 Non-text part: text/html
  part}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=text --part=6, rfc822's text part"
 notmuch show --format=text --part=6 'id:[hidden email]' >OUTPUT
@@ -307,7 +307,7 @@ cat <<EOF >EXPECTED
 This is an embedded message, with a multipart/alternative part.
  part}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=text --part=7, inline attachement"
 notmuch show --format=text --part=7 'id:[hidden email]' >OUTPUT
@@ -316,7 +316,7 @@ cat <<EOF >EXPECTED
 This is a text attachment.
  attachment}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=text --part=8, plain text part"
 notmuch show --format=text --part=8 'id:[hidden email]' >OUTPUT
@@ -327,7 +327,7 @@ And this message is signed.
 -Carl
  part}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=text --part=9, pgp signature (unverified)"
 notmuch show --format=text --part=9 'id:[hidden email]' >OUTPUT
@@ -336,7 +336,7 @@ cat <<EOF >EXPECTED
 Non-text part: application/pgp-signature
  part}
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=text --part=8, no part, expect error"
 test_expect_success "notmuch show --format=text --part=8 'id:[hidden email]'"
@@ -448,15 +448,15 @@ test_expect_success "notmuch show --format=json --part=10 'id:87liy5ap00.fsf@yoo
 
 test_begin_subtest "--format=raw"
 notmuch show --format=raw 'id:[hidden email]' >OUTPUT
-test_expect_equal_file OUTPUT "${MAIL_DIR}"/multipart
+test_expect_equal_file "${MAIL_DIR}"/multipart  OUTPUT
 
 test_begin_subtest "--format=raw --part=0, full message"
 notmuch show --format=raw --part=0 'id:[hidden email]' >OUTPUT
-test_expect_equal_file OUTPUT "${MAIL_DIR}"/multipart
+test_expect_equal_file "${MAIL_DIR}"/multipart OUTPUT
 
 test_begin_subtest "--format=raw --part=1, message body"
 notmuch show --format=raw --part=1 'id:[hidden email]' >OUTPUT
-test_expect_equal_file OUTPUT "${MAIL_DIR}"/multipart
+test_expect_equal_file "${MAIL_DIR}"/multipart OUTPUT
 
 test_begin_subtest "--format=raw --part=2, multipart/mixed"
 notmuch show --format=raw --part=2 'id:[hidden email]' >OUTPUT
@@ -501,11 +501,11 @@ And this message is signed.
 
 --=-=-=--
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=raw --part=3, rfc822 part"
 notmuch show --format=raw --part=3 'id:[hidden email]' >OUTPUT
-test_expect_equal_file OUTPUT embedded_message
+test_expect_equal_file embedded_message OUTPUT
 
 test_begin_subtest "--format=raw --part=4, rfc822's multipart"
 notmuch show --format=raw --part=4 'id:[hidden email]' >OUTPUT
@@ -531,28 +531,28 @@ This is an embedded message, with a multipart/alternative part.
 
 --==-=-==--
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=raw --part=5, rfc822's html part"
 notmuch show --format=raw --part=5 'id:[hidden email]' >OUTPUT
 cat <<EOF >EXPECTED
 <p>This is an embedded message, with a multipart/alternative part.</p>
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=raw --part=6, rfc822's text part"
 notmuch show --format=raw --part=6 'id:[hidden email]' >OUTPUT
 cat <<EOF >EXPECTED
 This is an embedded message, with a multipart/alternative part.
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=raw --part=7, inline attachment"
 notmuch show --format=raw --part=7 'id:[hidden email]' >OUTPUT
 cat <<EOF >EXPECTED
 This is a text attachment.
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=raw --part=8, plain text part"
 notmuch show --format=raw --part=8 'id:[hidden email]' >OUTPUT
@@ -561,7 +561,7 @@ And this message is signed.
 
 -Carl
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=raw --part=9, pgp signature (unverified)"
 notmuch show --format=raw --part=9 'id:[hidden email]' >OUTPUT
@@ -576,7 +576,7 @@ W6cAmQE4dcYrx/LPLtYLZm1jsGauE5hE
 =zkga
 -----END PGP SIGNATURE-----
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=raw --part=10, no part, expect error"
 test_expect_success "notmuch show --format=raw --part=8 'id:[hidden email]'"
@@ -587,7 +587,7 @@ printf "From [hidden email] Fri Jan  5 15:43:57 2001\n" >EXPECTED
 cat "${MAIL_DIR}"/multipart >>EXPECTED
 # mbox output is expected to include a blank line
 echo >>EXPECTED
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "--format=mbox --part=1, incompatible, expect error"
 test_expect_success "! notmuch show --format=mbox --part=1 'id:[hidden email]'"
@@ -614,7 +614,7 @@ Non-text part: text/html
 >
 > -Carl
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "'notmuch reply' to a multipart message with json format"
 notmuch reply --format=json 'id:[hidden email]' | notmuch_json_show_sanitize >OUTPUT
diff --git a/test/T240-dump-restore.sh b/test/T240-dump-restore.sh
index 1f1f0866..75fb0b40 100755
--- a/test/T240-dump-restore.sh
+++ b/test/T240-dump-restore.sh
@@ -129,7 +129,7 @@ test_begin_subtest "Check for a safe set of message-ids"
 notmuch search --output=messages from:cworth | sed s/^id:// > EXPECTED
 notmuch search --output=messages from:cworth | sed s/^id:// |\
  $TEST_DIRECTORY/hex-xcode --direction=encode > OUTPUT
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "format=batch-tag, dump sanity check."
 NOTMUCH_DUMP_TAGS --format=sup from:cworth | cut -f1 -d' ' | \
diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index 4ca081c8..ef599849 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -14,7 +14,7 @@ test_expect_success "${TEST_EMACS} -Q --batch --load $TEST_DIRECTORY/test-lib.el
 test_begin_subtest "Basic notmuch-hello view in emacs"
 test_emacs '(notmuch-hello)
     (test-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello
+test_expect_equal_file $EXPECTED/notmuch-hello OUTPUT
 
 test_begin_subtest "Saved search with 0 results"
 test_emacs '(let ((notmuch-show-empty-saved-searches t)
@@ -24,20 +24,20 @@ test_emacs '(let ((notmuch-show-empty-saved-searches t)
  ("empty" . "tag:doesnotexist"))))
       (notmuch-hello)
       (test-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-with-empty
+test_expect_equal_file $EXPECTED/notmuch-hello-with-empty OUTPUT
 
 test_begin_subtest "No saved searches displayed (all with 0 results)"
 test_emacs '(let ((notmuch-saved-searches
    '\''(("empty" . "tag:doesnotexist"))))
       (notmuch-hello)
       (test-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-no-saved-searches
+test_expect_equal_file $EXPECTED/notmuch-hello-no-saved-searches OUTPUT
 
 test_begin_subtest "Basic notmuch-search view in emacs"
 test_emacs '(notmuch-search "tag:inbox")
     (notmuch-test-wait)
     (test-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-search-tag-inbox
+test_expect_equal_file $EXPECTED/notmuch-search-tag-inbox OUTPUT
 
 test_begin_subtest "Incremental parsing of search results"
 test_emacs "(ad-enable-advice 'notmuch-search-process-filter 'around 'pessimal)
@@ -47,7 +47,7 @@ test_emacs "(ad-enable-advice 'notmuch-search-process-filter 'around 'pessimal)
     (ad-disable-advice 'notmuch-search-process-filter 'around 'pessimal)
     (ad-activate 'notmuch-search-process-filter)
     (test-output)"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-search-tag-inbox
+test_expect_equal_file $EXPECTED/notmuch-search-tag-inbox OUTPUT
 
 test_begin_subtest "Navigation of notmuch-hello to search results"
 test_emacs '(notmuch-hello)
@@ -56,34 +56,34 @@ test_emacs '(notmuch-hello)
     (widget-button-press (1- (point)))
     (notmuch-test-wait)
     (test-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-view-inbox
+test_expect_equal_file $EXPECTED/notmuch-hello-view-inbox OUTPUT
 
 test_begin_subtest "Basic notmuch-show view in emacs"
 maildir_storage_thread=$(notmuch search --output=threads id:[hidden email])
 test_emacs "(notmuch-show \"$maildir_storage_thread\")
     (test-output)"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
+test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage OUTPUT
 
 test_begin_subtest "Basic notmuch-show view in emacs default indentation"
 maildir_storage_thread=$(notmuch search --output=threads id:[hidden email])
 test_emacs "(let ((notmuch-show-indent-messages-width 1))
       (notmuch-show \"$maildir_storage_thread\")
       (test-output))"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
+test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage OUTPUT
 
 test_begin_subtest "Basic notmuch-show view in emacs without indentation"
 maildir_storage_thread=$(notmuch search --output=threads id:[hidden email])
 test_emacs "(let ((notmuch-show-indent-messages-width 0))
       (notmuch-show \"$maildir_storage_thread\")
       (test-output))"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage-without-indentation
+test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage-without-indentation OUTPUT
 
 test_begin_subtest "Basic notmuch-show view in emacs with fourfold indentation"
 maildir_storage_thread=$(notmuch search --output=threads id:[hidden email])
 test_emacs "(let ((notmuch-show-indent-messages-width 4))
       (notmuch-show \"$maildir_storage_thread\")
       (test-output))"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage-with-fourfold-indentation
+test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage-with-fourfold-indentation OUTPUT
 
 test_begin_subtest "notmuch-show for message with invalid From"
 add_message "[subject]=\"message-with-invalid-from\"" \
@@ -100,7 +100,7 @@ Date: GENERATED_DATE
 This is just a test message (#1)
 EOF
 notmuch_date_sanitize < OUTPUT.raw > OUTPUT
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Navigation of notmuch-search to thread view"
 test_emacs '(notmuch-search "tag:inbox")
@@ -110,7 +110,7 @@ test_emacs '(notmuch-search "tag:inbox")
     (notmuch-search-show-thread)
     (notmuch-test-wait)
     (test-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
+test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage OUTPUT
 
 test_begin_subtest "Add tag from search view"
 os_x_darwin_thread=$(notmuch search --output=threads id:[hidden email])
@@ -206,7 +206,7 @@ Content-Type: text/plain
 
 This is a test that messages are sent via SMTP
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Folding a long header when sending via (fake) SMTP"
 long_subject="This is a long subject `echo {1..1000}`"
@@ -284,7 +284,7 @@ Content-Type: text/plain
 
 This is a test that long headers are folded when messages are sent via SMTP
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Verify that sent messages are saved/searchable (via FCC)"
 notmuch new > /dev/null
@@ -301,7 +301,7 @@ To:
 Subject:
 --text follows this line--
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 # Make another FCC maildir specific for the next test
 mkdir -p mail/sent-string/cur
@@ -319,7 +319,7 @@ Subject:
 Fcc: ${MAIL_DIR}/sent-string
 --text follows this line--
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 # Make more FCC maildirs specific for the next test
 mkdir -p mail/sent-list-match/cur
@@ -342,7 +342,7 @@ Subject:
 Fcc: ${MAIL_DIR}/sent-list-match
 --text follows this line--
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 # Make another FCC maildir specific for the next test
 mkdir -p mail/sent-list-catch-all/cur
@@ -362,7 +362,7 @@ Subject:
 Fcc: ${MAIL_DIR}/sent-list-catch-all
 --text follows this line--
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "notmuch-fcc-dirs set to a list (no match)"
 test_emacs "(let ((notmuch-fcc-dirs
@@ -376,7 +376,7 @@ To:
 Subject:
 --text follows this line--
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Reply within emacs"
 test_emacs '(let ((message-hidden-headers ''()))
@@ -398,7 +398,7 @@ Notmuch Test Suite <[hidden email]> writes:
 
 > This is a test that messages are sent via SMTP
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Reply from alternate address within emacs"
 add_message '[from]="Sender <[hidden email]>"' \
@@ -421,7 +421,7 @@ Sender <[hidden email]> writes:
 
 > This is just a test message (#${gen_msg_cnt})
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Reply from address in named group list within emacs"
 add_message '[from]="Sender <[hidden email]>"' \
@@ -445,7 +445,7 @@ Sender <[hidden email]> writes:
 
 > This is just a test message (#${gen_msg_cnt})
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Reply within emacs to a multipart/mixed message"
 test_emacs '(let ((message-hidden-headers ''()))
@@ -506,7 +506,7 @@ Adrian Perez de Castro <[hidden email]> writes:
 > [hidden email]
 > http://notmuchmail.org/mailman/listinfo/notmuch
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Reply within emacs to a multipart/alternative message"
 test_emacs '(let ((message-hidden-headers ''()))
@@ -576,7 +576,7 @@ Alex Botero-Lowry <[hidden email]> writes:
 > [hidden email]
 > http://notmuchmail.org/mailman/listinfo/notmuch
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Reply within emacs to an html-only message"
 add_message '[content-type]="text/html"' \
@@ -597,7 +597,7 @@ Notmuch Test Suite <[hidden email]> writes:
 
 > Hi,This is an HTML test message.OK?
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Reply within emacs to message from self"
 test_subtest_known_broken
@@ -644,7 +644,7 @@ Notmuch Test Suite <[hidden email]> writes:
 
 > <#!part disposition=inline>
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Save attachment from within emacs using notmuch-show-save-attachments"
 # save as archive to test that Emacs does not re-compress .gz
@@ -691,7 +691,7 @@ test_begin_subtest "View raw message within emacs"
 test_emacs '(notmuch-show "id:[hidden email]")
     (notmuch-show-view-raw-message)
     (test-output)'
-test_expect_equal_file OUTPUT $EXPECTED/raw-message-cf0c4d-52ad0a
+test_expect_equal_file $EXPECTED/raw-message-cf0c4d-52ad0a OUTPUT
 
 test_begin_subtest "Hiding/showing signature in notmuch-show view"
 maildir_storage_thread=$(notmuch search --output=threads id:[hidden email])
@@ -701,7 +701,7 @@ test_emacs "(notmuch-show \"$maildir_storage_thread\")
     (search-backward \"Click/Enter to hide.\")
     (button-activate (button-at (point)))
     (test-output)"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
+test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage OUTPUT
 
 test_begin_subtest "Detection and hiding of top-post quoting of message"
 add_message '[subject]="The problem with top-posting"' \
@@ -749,13 +749,13 @@ Thanks for the advice! I will be sure to put it to good use.
 
 [ 9-line hidden original message. Click/Enter to show. ]" > EXPECTED
 notmuch_date_sanitize < OUTPUT.raw > OUTPUT
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Hiding message in notmuch-show view"
 test_emacs '(notmuch-show "id:[hidden email]")
     (notmuch-show-toggle-message)
     (test-visible-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-hidden-messages
+test_expect_equal_file $EXPECTED/notmuch-show-thread-with-hidden-messages OUTPUT
 
 test_begin_subtest "Hiding message with visible citation in notmuch-show view"
 test_emacs '(notmuch-show "id:[hidden email]")
@@ -763,7 +763,7 @@ test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.
     (button-activate (button-at (point)))
     (notmuch-show-toggle-message)
     (test-visible-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-hidden-messages
+test_expect_equal_file $EXPECTED/notmuch-show-thread-with-hidden-messages OUTPUT
 
 test_begin_subtest "notmuch-show: show message headers"
 test_emacs \
@@ -771,7 +771,7 @@ test_emacs \
        (notmuch-message-headers-visible t))
    (notmuch-show "id:[hidden email]")
    (test-visible-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-message-with-headers-visible
+test_expect_equal_file $EXPECTED/notmuch-show-message-with-headers-visible OUTPUT
 
 test_begin_subtest "notmuch-show: hide message headers"
 test_emacs \
@@ -779,7 +779,7 @@ test_emacs \
        (notmuch-message-headers-visible nil))
    (notmuch-show "id:[hidden email]")
    (test-visible-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-message-with-headers-hidden
+test_expect_equal_file $EXPECTED/notmuch-show-message-with-headers-hidden OUTPUT
 
 test_begin_subtest "notmuch-show: hide message headers (w/ notmuch-show-toggle-visibility-headers)"
 test_emacs \
@@ -788,20 +788,20 @@ test_emacs \
    (notmuch-show "id:[hidden email]")
    (notmuch-show-toggle-visibility-headers)
    (test-visible-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-message-with-headers-hidden
+test_expect_equal_file $EXPECTED/notmuch-show-message-with-headers-hidden OUTPUT
 
 test_begin_subtest "notmuch-show: collapse all messages in thread"
 test_emacs '(notmuch-show "id:[hidden email]")
  (let ((current-prefix-arg t))
   (notmuch-show-open-or-close-all)
   (test-visible-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-all-messages-collapsed
+test_expect_equal_file $EXPECTED/notmuch-show-thread-with-all-messages-collapsed OUTPUT
 
 test_begin_subtest "notmuch-show: uncollapse all messages in thread"
 test_emacs '(notmuch-show "id:[hidden email]")
  (notmuch-show-open-or-close-all)
  (test-visible-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-all-messages-uncollapsed
+test_expect_equal_file $EXPECTED/notmuch-show-thread-with-all-messages-uncollapsed OUTPUT
 
 test_begin_subtest "Stashing in notmuch-show"
 add_message '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' \
@@ -847,7 +847,7 @@ http://mid.gmane.org/bought
 https://marc.info/?i=bought
 https://mid.mail-archive.com/bought
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Stashing in notmuch-search"
 test_emacs '(notmuch-search "id:\"bought\"")
@@ -872,14 +872,14 @@ test_emacs "(notmuch-search \"$message1 or $message2\")
     (redisplay)
     (notmuch-show-advance-and-archive)
     (test-output)"
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Refresh show buffer"
 test_emacs '(notmuch-show "id:[hidden email]")
     (test-visible-output "EXPECTED")
     (notmuch-show-refresh-view)
     (test-visible-output)'
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Refresh modified show buffer"
 test_emacs '(notmuch-show "id:[hidden email]")
@@ -889,7 +889,7 @@ test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.
     (test-visible-output "EXPECTED")
     (notmuch-show-refresh-view)
     (test-visible-output)'
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Do not call notmuch for non-inlinable application/mpeg parts"
 id='message-with-application/[hidden email]'
diff --git a/test/T320-emacs-large-search-buffer.sh b/test/T320-emacs-large-search-buffer.sh
index 3fd6958a..e9d5e358 100755
--- a/test/T320-emacs-large-search-buffer.sh
+++ b/test/T320-emacs-large-search-buffer.sh
@@ -27,6 +27,6 @@ test_emacs '(notmuch-search "*")
     (notmuch-test-wait)
     (test-output)'
 sed -i -e s',  *, ,g' -e 's/xxx*/[BLOB]/g' OUTPUT
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_done
diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh
index 3cf644df..b7d3a2cf 100755
--- a/test/T350-crypto.sh
+++ b/test/T350-crypto.sh
@@ -233,7 +233,7 @@ notmuch show \
     --part=5 \
     --decrypt \
     subject:"test encrypted message 001" >OUTPUT
-test_expect_equal_file OUTPUT TESTATTACHMENT
+test_expect_equal_file TESTATTACHMENT OUTPUT
 
 test_begin_subtest "decryption failure with missing key"
 mv "${GNUPGHOME}"{,.bak}
diff --git a/test/T370-search-folder-coherence.sh b/test/T370-search-folder-coherence.sh
index da4ec2b8..d1cb45ec 100755
--- a/test/T370-search-folder-coherence.sh
+++ b/test/T370-search-folder-coherence.sh
@@ -28,7 +28,7 @@ MAIL_DIR/msg-001
 MAIL_DIR/spam/msg-001
 EOF
 notmuch search --output=files id:$id_x | notmuch_search_files_sanitize >OUTPUT
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Test matches folder:spam"
 output=$(notmuch search folder:spam)
diff --git a/test/T390-python.sh b/test/T390-python.sh
index b27f0740..a9a61145 100755
--- a/test/T390-python.sh
+++ b/test/T390-python.sh
@@ -16,7 +16,7 @@ for t in q_new.search_threads():
     print (t.get_thread_id())
 EOF
 notmuch search --sort=oldest-first --output=threads tag:inbox | sed s/^thread:// > EXPECTED
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "compare message ids"
 test_python <<EOF
@@ -28,7 +28,7 @@ for m in q_new.search_messages():
     print (m.get_message_id())
 EOF
 notmuch search --sort=oldest-first --output=messages tag:inbox | sed s/^id:// > EXPECTED
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "get non-existent file"
 test_python <<EOF
diff --git a/test/T395-ruby.sh b/test/T395-ruby.sh
index 20e06917..52f9fe0f 100755
--- a/test/T395-ruby.sh
+++ b/test/T395-ruby.sh
@@ -23,7 +23,7 @@ for t in @q.search_threads do
 end
 EOF
 notmuch search --sort=oldest-first --output=threads tag:inbox | sed s/^thread:// > EXPECTED
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "compare message ids"
 test_ruby <<"EOF"
@@ -40,7 +40,7 @@ for m in @q.search_messages do
 end
 EOF
 notmuch search --sort=oldest-first --output=messages tag:inbox | sed s/^id:// > EXPECTED
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "get non-existent file"
 test_ruby <<"EOF"
@@ -67,7 +67,7 @@ end
 print @q.count_messages(),"\n"
 EOF
 notmuch count --output=messages tag:inbox > EXPECTED
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "count threads"
 test_ruby <<"EOF"
@@ -81,7 +81,7 @@ end
 print @q.count_threads(),"\n"
 EOF
 notmuch count --output=threads tag:inbox > EXPECTED
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "get all tags"
 test_ruby <<"EOF"
@@ -97,6 +97,6 @@ for tag in @t do
 end
 EOF
 notmuch search --output=tags '*' > EXPECTED
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_done
diff --git a/test/T410-argument-parsing.sh b/test/T410-argument-parsing.sh
index f8ff8ff9..fad134e3 100755
--- a/test/T410-argument-parsing.sh
+++ b/test/T410-argument-parsing.sh
@@ -12,6 +12,6 @@ string foo
 positional arg 1 pos1
 positional arg 2 pos2
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_done
diff --git a/test/T440-emacs-hello.sh b/test/T440-emacs-hello.sh
index a8ed2282..ac214a5b 100755
--- a/test/T440-emacs-hello.sh
+++ b/test/T440-emacs-hello.sh
@@ -13,7 +13,7 @@ test_emacs "(let ((notmuch-hello-sections
                                      \"Test\" '((\"inbox\" . \"tag:inbox\")))))))
            (notmuch-hello)
            (test-output))"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-new-section
+test_expect_equal_file $EXPECTED/notmuch-hello-new-section OUTPUT
 
 test_begin_subtest "User-defined section with empty, hidden entry"
 test_emacs "(let ((notmuch-hello-sections
@@ -24,7 +24,7 @@ test_emacs "(let ((notmuch-hello-sections
                                      :hide-empty-searches t)))))
              (notmuch-hello)
              (test-output))"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-with-empty
+test_expect_equal_file $EXPECTED/notmuch-hello-section-with-empty OUTPUT
 
 test_begin_subtest "User-defined section, unread tag filtered out"
 test_emacs "(let ((notmuch-hello-sections
@@ -33,7 +33,7 @@ test_emacs "(let ((notmuch-hello-sections
                                      :hide-tags '(\"unread\"))))))
              (notmuch-hello)
              (test-output))"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-hidden-tag
+test_expect_equal_file $EXPECTED/notmuch-hello-section-hidden-tag OUTPUT
 
 test_begin_subtest "User-defined section, different query for counts"
 test_emacs "(let ((notmuch-hello-sections
@@ -42,21 +42,21 @@ test_emacs "(let ((notmuch-hello-sections
                                      :filter-count \"tag:signed\")))))
              (notmuch-hello)
              (test-output))"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-counts
+test_expect_equal_file $EXPECTED/notmuch-hello-section-counts OUTPUT
 
 test_begin_subtest "Empty custom tags section"
 test_emacs "(let* ((widget (widget-create 'notmuch-hello-tags-section))
                    (notmuch-hello-sections (list (widget-value widget))))
              (notmuch-hello)
              (test-output))"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-empty-custom-tags-section
+test_expect_equal_file $EXPECTED/notmuch-hello-empty-custom-tags-section OUTPUT
 
 test_begin_subtest "Empty custom queries section"
 test_emacs "(let* ((widget (widget-create 'notmuch-hello-query-section))
                    (notmuch-hello-sections (list (widget-value widget))))
              (notmuch-hello)
              (test-output))"
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-empty-custom-queries-section
+test_expect_equal_file $EXPECTED/notmuch-hello-empty-custom-queries-section OUTPUT
 
 test_begin_subtest "Column alignment for tag/queries with long names"
 tag=a-very-long-tag # length carefully calculated for 80 characters window width
@@ -64,6 +64,6 @@ notmuch tag +$tag '*'
 test_emacs '(notmuch-hello)
             (test-output)'
 notmuch tag -$tag '*'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-long-names
+test_expect_equal_file $EXPECTED/notmuch-hello-long-names OUTPUT
 
 test_done
diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
index 0342a874..74d546bd 100755
--- a/test/T450-emacs-show.sh
+++ b/test/T450-emacs-show.sh
@@ -27,7 +27,7 @@ EOF
 test_emacs "(notmuch-show \"id:$message_id\")
     (test-visible-output \"OUTPUT.raw\")"
 notmuch_date_sanitize < OUTPUT.raw > OUTPUT
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Bare subject #1"
 output=$(test_emacs '(notmuch-show-strip-re "Re: subject")')
@@ -45,20 +45,20 @@ test_begin_subtest "don't process cryptographic MIME parts"
 test_emacs '(let ((notmuch-crypto-process-mime nil))
  (notmuch-show "id:[hidden email]")
  (test-visible-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-off
+test_expect_equal_file $EXPECTED/notmuch-show-process-crypto-mime-parts-off OUTPUT
 
 test_begin_subtest "process cryptographic MIME parts"
 test_emacs '(let ((notmuch-crypto-process-mime t))
  (notmuch-show "id:[hidden email]")
  (test-visible-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on
+test_expect_equal_file $EXPECTED/notmuch-show-process-crypto-mime-parts-on OUTPUT
 
 test_begin_subtest "process cryptographic MIME parts (w/ notmuch-show-toggle-process-crypto)"
 test_emacs '(let ((notmuch-crypto-process-mime nil))
  (notmuch-show "id:[hidden email]")
  (notmuch-show-toggle-process-crypto)
  (test-visible-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on
+test_expect_equal_file $EXPECTED/notmuch-show-process-crypto-mime-parts-on OUTPUT
 
 test_begin_subtest "notmuch-show: don't elide non-matching messages"
 test_emacs '(let ((notmuch-show-only-matching-messages nil))
@@ -67,7 +67,7 @@ test_emacs '(let ((notmuch-show-only-matching-messages nil))
  (notmuch-search-show-thread)
  (notmuch-test-wait)
  (test-visible-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-off
+test_expect_equal_file $EXPECTED/notmuch-show-elide-non-matching-messages-off OUTPUT
 
 test_begin_subtest "notmuch-show: elide non-matching messages"
 test_emacs '(let ((notmuch-show-only-matching-messages t))
@@ -76,7 +76,7 @@ test_emacs '(let ((notmuch-show-only-matching-messages 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_expect_equal_file $EXPECTED/notmuch-show-elide-non-matching-messages-on OUTPUT
 
 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))
@@ -86,7 +86,7 @@ test_emacs '(let ((notmuch-show-only-matching-messages nil))
  (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_expect_equal_file $EXPECTED/notmuch-show-elide-non-matching-messages-on OUTPUT
 
 test_begin_subtest "notmuch-show: elide non-matching messages (w/ prefix arg to notmuch-show)"
 test_emacs '(let ((notmuch-show-only-matching-messages nil))
@@ -95,7 +95,7 @@ test_emacs '(let ((notmuch-show-only-matching-messages nil))
  (notmuch-search-show-thread t)
  (notmuch-test-wait)
  (test-visible-output))'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on
+test_expect_equal_file $EXPECTED/notmuch-show-elide-non-matching-messages-on OUTPUT
 
 test_begin_subtest "notmuch-show: disable indentation of thread content (w/ notmuch-show-toggle-thread-indentation)"
 test_emacs '(notmuch-search "from:[hidden email] and subject:\"Maildir storage\"")
@@ -104,7 +104,7 @@ test_emacs '(notmuch-search "from:[hidden email] and subject:\"Maildir st
  (notmuch-test-wait)
  (notmuch-show-toggle-thread-indentation)
  (test-visible-output)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-indent-thread-content-off
+test_expect_equal_file $EXPECTED/notmuch-show-indent-thread-content-off OUTPUT
 
 test_begin_subtest "id buttonization"
 add_message '[body]="
@@ -161,7 +161,7 @@ cid:xxx
 <<mid:abc>>. <<mid:abc>>, <<mid:abc>>;
 EOF
 notmuch_date_sanitize < OUTPUT.raw > OUTPUT
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 
 test_begin_subtest "Show handles subprocess errors"
diff --git a/test/T455-emacs-charsets.sh b/test/T455-emacs-charsets.sh
index 7624fa4d..5d6d53a8 100755
--- a/test/T455-emacs-charsets.sh
+++ b/test/T455-emacs-charsets.sh
@@ -48,7 +48,7 @@ awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT
 cat <<EOF >EXPECTED
 Yen: $UTF8_YEN
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "8bit text parts are decoded when rendering"
 test_emacs '(notmuch-show "id:[hidden email]")
@@ -57,7 +57,7 @@ awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT
 cat <<EOF >EXPECTED
 Yen: $UTF8_YEN
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "HTML parts are decoded when rendering"
 test_emacs '(notmuch-show "id:[hidden email]")
@@ -67,7 +67,7 @@ cat <<EOF >EXPECTED
 [ text/html ]
 Yen: $UTF8_YEN
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 # Test saving
 
@@ -125,7 +125,7 @@ awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT
 cat <<EOF >EXPECTED
 Yen: =A2=44
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "8bit text message are not decoded when viewing"
 test_emacs '(notmuch-show "id:[hidden email]")
@@ -135,6 +135,6 @@ awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT
 cat <<EOF >EXPECTED
 Yen: $BIG5_YEN
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_done
diff --git a/test/T460-emacs-tree.sh b/test/T460-emacs-tree.sh
index b6181b51..76ababfd 100755
--- a/test/T460-emacs-tree.sh
+++ b/test/T460-emacs-tree.sh
@@ -12,7 +12,7 @@ test_emacs '(notmuch-tree "tag:inbox")
     (notmuch-test-wait)
     (test-output)
     (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
+test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT
 
 test_begin_subtest "Refreshed notmuch-tree view in emacs"
 test_emacs '(notmuch-tree "tag:inbox")
@@ -21,7 +21,7 @@ test_emacs '(notmuch-tree "tag:inbox")
     (notmuch-test-wait)
     (test-output)
     (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
+test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT
 
 # In the following tag tests we make sure the display is updated
 # correctly and, in a separate test, that the database is updated
@@ -34,7 +34,7 @@ test_emacs '(notmuch-tree "tag:inbox")
     (notmuch-tree-tag (list "+test_tag"))
     (test-output)
     (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-tagged
+test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox-tagged OUTPUT
 
 test_begin_subtest "Tag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_tag')
@@ -47,7 +47,7 @@ test_emacs '(notmuch-tree "tag:inbox")
     (notmuch-tree-tag (list "-test_tag"))
     (test-output)
     (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
+test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT
 
 test_begin_subtest "Untag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_tag')
@@ -61,7 +61,7 @@ test_emacs '(notmuch-tree "tag:inbox")
     (notmuch-tree-tag-thread (list "+test_thread_tag"))
     (test-output)
     (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-thread-tagged
+test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox-thread-tagged OUTPUT
 
 test_begin_subtest "Tag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_thread_tag')
@@ -82,7 +82,7 @@ test_emacs '(notmuch-tree "tag:inbox")
     (notmuch-tree-tag-thread (list "-test_thread_tag"))
     (test-output)
     (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
+test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT
 
 test_begin_subtest "Untag message in notmuch tree view (database)"
 output=$(notmuch search --output=messages 'tag:test_thread_tag')
@@ -98,7 +98,7 @@ test_emacs '(notmuch-hello)
     (notmuch-test-wait)
     (test-output)
     (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
+test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT
 
 test_begin_subtest "Tree view of a single thread (from search)"
 test_emacs '(notmuch-hello)
@@ -110,7 +110,7 @@ test_emacs '(notmuch-hello)
     (notmuch-test-wait)
     (test-output)
     (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
+test_expect_equal_file $EXPECTED/notmuch-tree-single-thread OUTPUT
 
 test_begin_subtest "Tree view of a single thread (from show)"
 test_emacs '(notmuch-hello)
@@ -123,7 +123,7 @@ test_emacs '(notmuch-hello)
     (notmuch-test-wait)
     (test-output)
     (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
+test_expect_equal_file $EXPECTED/notmuch-tree-single-thread OUTPUT
 
 test_begin_subtest "Message window of tree view"
 test_emacs '(notmuch-hello)
@@ -138,7 +138,7 @@ test_emacs '(notmuch-hello)
     (test-output)
     (delete-other-windows)'
 cp OUTPUT /tmp/mjwout
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-show-window
+test_expect_equal_file $EXPECTED/notmuch-tree-show-window OUTPUT
 
 test_begin_subtest "Stash id"
 output=$(test_emacs '(notmuch-tree "id:1258498485-sup-142@elly")
diff --git a/test/T480-hex-escaping.sh b/test/T480-hex-escaping.sh
index 10527b18..86cf3729 100755
--- a/test/T480-hex-escaping.sh
+++ b/test/T480-hex-escaping.sh
@@ -5,7 +5,7 @@ test_description="hex encoding and decoding"
 test_begin_subtest "round trip"
 find $TEST_DIRECTORY/corpus -type f -print | sort | xargs cat > EXPECTED
 $TEST_DIRECTORY/hex-xcode --direction=encode < EXPECTED | $TEST_DIRECTORY/hex-xcode --direction=decode > OUTPUT
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "punctuation"
 tag1='comic_swear=$&^%$^%\\//-+$^%$'
@@ -28,7 +28,7 @@ test_begin_subtest "round trip (in-place)"
 find $TEST_DIRECTORY/corpus -type f -print | sort | xargs cat > EXPECTED
 $TEST_DIRECTORY/hex-xcode --in-place --direction=encode < EXPECTED |\
      $TEST_DIRECTORY/hex-xcode --in-place --direction=decode > OUTPUT
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "punctuation (in-place)"
 tag1='comic_swear=$&^%$^%\\//-+$^%$'
diff --git a/test/T500-search-date.sh b/test/T500-search-date.sh
index 198a2e60..f10207f8 100755
--- a/test/T500-search-date.sh
+++ b/test/T500-search-date.sh
@@ -26,6 +26,6 @@ thread:XXX   2009-11-18 [1/2] Carl Worth| Jan Janak; [notmuch] [PATCH] Older ver
 thread:XXX   2009-11-18 [1/3] Carl Worth| Aron Griffis, Keith Packard; [notmuch] archive (inbox unread)
 thread:XXX   2009-11-18 [1/2] Carl Worth| Keith Packard; [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread)
 EOF
-test_expect_equal_file OUTPUT EXPECTED
+test_expect_equal_file EXPECTED OUTPUT
 
 test_done
--
2.11.0

_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] test: remove debugging "output"

---
 test/T460-emacs-tree.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/T460-emacs-tree.sh b/test/T460-emacs-tree.sh
index 76ababfd..958ff888 100755
--- a/test/T460-emacs-tree.sh
+++ b/test/T460-emacs-tree.sh
@@ -137,7 +137,6 @@ test_emacs '(notmuch-hello)
     (select-window notmuch-tree-message-window)
     (test-output)
     (delete-other-windows)'
-cp OUTPUT /tmp/mjwout
 test_expect_equal_file $EXPECTED/notmuch-tree-show-window OUTPUT
 
 test_begin_subtest "Stash id"
--
2.11.0

_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch
Tomi Ollila-2 Tomi Ollila-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 1/2] test: standardize argument order to test_expect_equal_file

In reply to this post by David Bremner-2
On Wed, Apr 05 2017, David Bremner <[hidden email]> wrote:

> It is annoying to debug failing tests when the interpretation of the
> diffs is reversed for some tests.
> ---

+1

>  test/T080-search.sh                    |  2 +-
>  test/T090-search-output.sh             | 36 +++++++--------
>  test/T095-address.sh                   | 26 +++++------
>  test/T190-multipart.sh                 | 46 +++++++++----------
>  test/T240-dump-restore.sh              |  2 +-
>  test/T310-emacs.sh                     | 80 +++++++++++++++++-----------------
>  test/T320-emacs-large-search-buffer.sh |  2 +-
>  test/T350-crypto.sh                    |  2 +-
>  test/T370-search-folder-coherence.sh   |  2 +-
>  test/T390-python.sh                    |  4 +-
>  test/T395-ruby.sh                      | 10 ++---
>  test/T410-argument-parsing.sh          |  2 +-
>  test/T440-emacs-hello.sh               | 14 +++---
>  test/T450-emacs-show.sh                | 20 ++++-----
>  test/T455-emacs-charsets.sh            | 10 ++---
>  test/T460-emacs-tree.sh                | 20 ++++-----
>  test/T480-hex-escaping.sh              |  4 +-
>  test/T500-search-date.sh               |  2 +-
>  18 files changed, 142 insertions(+), 142 deletions(-)
>
> diff --git a/test/T080-search.sh b/test/T080-search.sh
> index 6149da93..d2d71ca9 100755
> --- a/test/T080-search.sh
> +++ b/test/T080-search.sh
> @@ -144,7 +144,7 @@ thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unr
>  thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; subject search test (phrase) (inbox unread)
>  thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; this phrase should not match the subject search test (inbox unread)
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Search body (utf-8):"
>  add_message '[subject]="utf8-message-body-subject"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' '[body]="message body utf8: bödý"'
> diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh
> index a28eaf20..dccefcb7 100755
> --- a/test/T090-search-output.sh
> +++ b/test/T090-search-output.sh
> @@ -32,7 +32,7 @@ thread:THREADID
>  thread:THREADID
>  thread:THREADID
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=threads --format=json"
>  notmuch search --format=json --output=threads '*' | sed -e s/\".*\"/\"THREADID\"/ >OUTPUT
> @@ -120,25 +120,25 @@ id:[hidden email]
>  id:[hidden email]
>  id:[hidden email]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=messages --duplicate=1"
>  notmuch search --output=messages --duplicate=1 '*' >OUTPUT
>  # reuse same EXPECTED as above
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=messages --duplicate=2"
>  notmuch search --output=messages --duplicate=2 '*' >OUTPUT
>  cat <<EOF >EXPECTED
>  id:[hidden email]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=messages --duplicate=3"
>  notmuch search --output=messages --duplicate=3 '*' >OUTPUT
>  cat <<EOF >EXPECTED
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=messages --format=json"
>  notmuch search --format=json --output=messages '*' >OUTPUT
> @@ -196,26 +196,26 @@ cat <<EOF >EXPECTED
>  "[hidden email]",
>  "[hidden email]"]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=messages --format=json --duplicate=1"
>  notmuch search --output=messages --format=json --duplicate=1 '*' >OUTPUT
>  # reuse same EXPECTED as above
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=messages --format=json --duplicate=2"
>  notmuch search --output=messages --format=json --duplicate=2 '*' >OUTPUT
>  cat <<EOF >EXPECTED
>  ["[hidden email]"]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=messages --format=json --duplicate=3"
>  notmuch search --output=messages --format=json --duplicate=3 '*' >OUTPUT
>  cat <<EOF >EXPECTED
>  []
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=files"
>  notmuch search --output=files '*' | notmuch_search_files_sanitize | sort >OUTPUT
> @@ -274,7 +274,7 @@ MAIL_DIR/foo/new/09:2,
>  MAIL_DIR/foo/new/10:2,
>  MAIL_DIR/new/04:2,
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  dup1=$(notmuch search --output=files id:[hidden email] | head -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,")
>  dup2=$(notmuch search --output=files id:[hidden email] | tail -n 1 | sed -e "s,$MAIL_DIR,MAIL_DIR,")
> @@ -335,7 +335,7 @@ MAIL_DIR/foo/cur/07:2,
>  MAIL_DIR/02:2,
>  MAIL_DIR/01:2,
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=files --format=json"
>  notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize \
> @@ -395,14 +395,14 @@ cat <<EOF | test_sort_json >EXPECTED
>  "MAIL_DIR/02:2,",
>  "MAIL_DIR/01:2,"]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=files --format=json --duplicate=2"
>  notmuch search --format=json --output=files --duplicate=2 '*' | notmuch_search_files_sanitize >OUTPUT
>  cat <<EOF >EXPECTED
>  ["$dup2"]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=tags"
>  notmuch search --output=tags '*' >OUTPUT
> @@ -412,7 +412,7 @@ inbox
>  signed
>  unread
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=tags --format=json"
>  notmuch search --format=json --output=tags '*' >OUTPUT
> @@ -422,7 +422,7 @@ cat <<EOF >EXPECTED
>  "signed",
>  "unread"]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "sanitize output for quoted-printable line-breaks in author and subject"
>  add_message "[subject]='two =?ISO-8859-1?Q?line=0A_subject?=
> @@ -431,16 +431,16 @@ notmuch search id:"$gen_msg_id" | notmuch_search_sanitize >OUTPUT
>  cat <<EOF >EXPECTED
>  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; two line  subject headers (inbox unread)
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "search for non-existent message prints nothing"
>  notmuch search "no-message-matches-this" > OUTPUT
>  echo -n >EXPECTED
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "search --format=json for non-existent message prints proper empty json"
>  notmuch search --format=json "no-message-matches-this" > OUTPUT
>  echo "[]" >EXPECTED
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_done
> diff --git a/test/T095-address.sh b/test/T095-address.sh
> index a194faf3..5931b147 100755
> --- a/test/T095-address.sh
> +++ b/test/T095-address.sh
> @@ -25,12 +25,12 @@ Adrian Perez de Castro <[hidden email]>
>  Israel Herraiz <[hidden email]>
>  Mikhail Gusarov <[hidden email]>
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "without --output"
>  notmuch address '*' >OUTPUT
>  # Use EXPECTED from previous subtest
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=sender --format=json"
>  notmuch address --output=sender --format=json '*' >OUTPUT
> @@ -53,7 +53,7 @@ cat <<EOF >EXPECTED
>  {"name": "Israel Herraiz", "address": "[hidden email]", "name-addr": "Israel Herraiz <[hidden email]>"},
>  {"name": "Mikhail Gusarov", "address": "[hidden email]", "name-addr": "Mikhail Gusarov <[hidden email]>"}]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=recipients"
>  notmuch address --output=recipients '*' >OUTPUT
> @@ -66,7 +66,7 @@ notmuch <[hidden email]>
>  Keith Packard <[hidden email]>
>  Mikhail Gusarov <[hidden email]>
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=sender --output=recipients"
>  notmuch address --output=sender --output=recipients '*' >OUTPUT
> @@ -94,7 +94,7 @@ Adrian Perez de Castro <[hidden email]>
>  Israel Herraiz <[hidden email]>
>  Mikhail Gusarov <[hidden email]>
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=sender --output=count"
>  notmuch address --output=sender --output=count '*' | sort -n >OUTPUT
> @@ -117,7 +117,7 @@ cat <<EOF >EXPECTED
>  7 Keith Packard <[hidden email]>
>  12 Carl Worth <[hidden email]>
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--output=count --format=json"
>  # Since the iteration order of GHashTable is not specified, we
> @@ -143,7 +143,7 @@ cat <<EOF >EXPECTED
>  {"name": "Rolland Santimano", "address": "[hidden email]", "name-addr": "Rolland Santimano <[hidden email]>", "count": 1}
>  {"name": "Stewart Smith", "address": "[hidden email]", "name-addr": "Stewart Smith <[hidden email]>", "count": 3}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--deduplicate=no --sort=oldest-first --output=sender"
>  notmuch address --deduplicate=no --sort=oldest-first --output=sender '*' >OUTPUT
> @@ -201,7 +201,7 @@ Chris Wilson <[hidden email]>
>  Olivier Berger <[hidden email]>
>  François Boulogne <[hidden email]>
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--deduplicate=no --sort=newest-first --output=sender --output=recipients"
>  notmuch address --deduplicate=no --sort=newest-first --output=sender --output=recipients path:foo/new >OUTPUT
> @@ -213,7 +213,7 @@ [hidden email]
>  Lars Kellogg-Stedman <[hidden email]>
>  [hidden email]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--deduplicate=address --output=sender --output=recipients"
>  notmuch address --deduplicate=address --output=sender --output=recipients '*' | sort >OUTPUT
> @@ -238,7 +238,7 @@ Rolland Santimano <[hidden email]>
>  Stewart Smith <[hidden email]>
>  [hidden email]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  generate_message '[from]="Foo Bar <[hidden email]>"'
>  generate_message '[from]="Foo Bar <[hidden email]>"'
> @@ -266,7 +266,7 @@ Foo Bar <[hidden email]>
>  [hidden email]
>  [hidden email]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--deduplicate=mailbox --output=sender --output=count"
>  notmuch address --deduplicate=mailbox --output=sender --output=count from:example.com | sort -n >OUTPUT
> @@ -279,7 +279,7 @@ cat <<EOF >EXPECTED
>  2 Foo Bar <[hidden email]>
>  2 [hidden email]
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--deduplicate=address --output=sender --output=count"
>  notmuch address --deduplicate=address --output=sender --output=count from:example.com | sort -n >OUTPUT
> @@ -287,6 +287,6 @@ cat <<EOF >EXPECTED
>  3 Baz <[hidden email]>
>  7 Foo Bar <[hidden email]>
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_done
> diff --git a/test/T190-multipart.sh b/test/T190-multipart.sh
> index a6b155e9..12a10451 100755
> --- a/test/T190-multipart.sh
> +++ b/test/T190-multipart.sh
> @@ -178,7 +178,7 @@ Non-text part: application/pgp-signature
>   body}
>   message}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=text --part=1, message body"
>  notmuch show --format=text --part=1 'id:[hidden email]' >OUTPUT
> @@ -217,7 +217,7 @@ Non-text part: application/pgp-signature
>   part}
>   part}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=text --part=2, multipart/mixed"
>  notmuch show --format=text --part=2 'id:[hidden email]' >OUTPUT
> @@ -251,7 +251,7 @@ And this message is signed.
>   part}
>   part}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=text --part=3, rfc822 part"
>  notmuch show --format=text --part=3 'id:[hidden email]' >OUTPUT
> @@ -275,7 +275,7 @@ This is an embedded message, with a multipart/alternative part.
>   body}
>   part}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=text --part=4, rfc822's multipart"
>  notmuch show --format=text --part=4 'id:[hidden email]' >OUTPUT
> @@ -289,7 +289,7 @@ This is an embedded message, with a multipart/alternative part.
>   part}
>   part}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=text --part=5, rfc822's html part"
>  notmuch show --format=text --part=5 'id:[hidden email]' >OUTPUT
> @@ -298,7 +298,7 @@ cat <<EOF >EXPECTED
>  Non-text part: text/html
>   part}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=text --part=6, rfc822's text part"
>  notmuch show --format=text --part=6 'id:[hidden email]' >OUTPUT
> @@ -307,7 +307,7 @@ cat <<EOF >EXPECTED
>  This is an embedded message, with a multipart/alternative part.
>   part}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=text --part=7, inline attachement"
>  notmuch show --format=text --part=7 'id:[hidden email]' >OUTPUT
> @@ -316,7 +316,7 @@ cat <<EOF >EXPECTED
>  This is a text attachment.
>   attachment}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=text --part=8, plain text part"
>  notmuch show --format=text --part=8 'id:[hidden email]' >OUTPUT
> @@ -327,7 +327,7 @@ And this message is signed.
>  -Carl
>   part}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=text --part=9, pgp signature (unverified)"
>  notmuch show --format=text --part=9 'id:[hidden email]' >OUTPUT
> @@ -336,7 +336,7 @@ cat <<EOF >EXPECTED
>  Non-text part: application/pgp-signature
>   part}
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=text --part=8, no part, expect error"
>  test_expect_success "notmuch show --format=text --part=8 'id:[hidden email]'"
> @@ -448,15 +448,15 @@ test_expect_success "notmuch show --format=json --part=10 'id:87liy5ap00.fsf@yoo
>  
>  test_begin_subtest "--format=raw"
>  notmuch show --format=raw 'id:[hidden email]' >OUTPUT
> -test_expect_equal_file OUTPUT "${MAIL_DIR}"/multipart
> +test_expect_equal_file "${MAIL_DIR}"/multipart  OUTPUT
>  
>  test_begin_subtest "--format=raw --part=0, full message"
>  notmuch show --format=raw --part=0 'id:[hidden email]' >OUTPUT
> -test_expect_equal_file OUTPUT "${MAIL_DIR}"/multipart
> +test_expect_equal_file "${MAIL_DIR}"/multipart OUTPUT
>  
>  test_begin_subtest "--format=raw --part=1, message body"
>  notmuch show --format=raw --part=1 'id:[hidden email]' >OUTPUT
> -test_expect_equal_file OUTPUT "${MAIL_DIR}"/multipart
> +test_expect_equal_file "${MAIL_DIR}"/multipart OUTPUT
>  
>  test_begin_subtest "--format=raw --part=2, multipart/mixed"
>  notmuch show --format=raw --part=2 'id:[hidden email]' >OUTPUT
> @@ -501,11 +501,11 @@ And this message is signed.
>  
>  --=-=-=--
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=raw --part=3, rfc822 part"
>  notmuch show --format=raw --part=3 'id:[hidden email]' >OUTPUT
> -test_expect_equal_file OUTPUT embedded_message
> +test_expect_equal_file embedded_message OUTPUT
>  
>  test_begin_subtest "--format=raw --part=4, rfc822's multipart"
>  notmuch show --format=raw --part=4 'id:[hidden email]' >OUTPUT
> @@ -531,28 +531,28 @@ This is an embedded message, with a multipart/alternative part.
>  
>  --==-=-==--
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=raw --part=5, rfc822's html part"
>  notmuch show --format=raw --part=5 'id:[hidden email]' >OUTPUT
>  cat <<EOF >EXPECTED
>  <p>This is an embedded message, with a multipart/alternative part.</p>
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=raw --part=6, rfc822's text part"
>  notmuch show --format=raw --part=6 'id:[hidden email]' >OUTPUT
>  cat <<EOF >EXPECTED
>  This is an embedded message, with a multipart/alternative part.
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=raw --part=7, inline attachment"
>  notmuch show --format=raw --part=7 'id:[hidden email]' >OUTPUT
>  cat <<EOF >EXPECTED
>  This is a text attachment.
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=raw --part=8, plain text part"
>  notmuch show --format=raw --part=8 'id:[hidden email]' >OUTPUT
> @@ -561,7 +561,7 @@ And this message is signed.
>  
>  -Carl
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=raw --part=9, pgp signature (unverified)"
>  notmuch show --format=raw --part=9 'id:[hidden email]' >OUTPUT
> @@ -576,7 +576,7 @@ W6cAmQE4dcYrx/LPLtYLZm1jsGauE5hE
>  =zkga
>  -----END PGP SIGNATURE-----
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=raw --part=10, no part, expect error"
>  test_expect_success "notmuch show --format=raw --part=8 'id:[hidden email]'"
> @@ -587,7 +587,7 @@ printf "From [hidden email] Fri Jan  5 15:43:57 2001\n" >EXPECTED
>  cat "${MAIL_DIR}"/multipart >>EXPECTED
>  # mbox output is expected to include a blank line
>  echo >>EXPECTED
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "--format=mbox --part=1, incompatible, expect error"
>  test_expect_success "! notmuch show --format=mbox --part=1 'id:[hidden email]'"
> @@ -614,7 +614,7 @@ Non-text part: text/html
>  >
>  > -Carl
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "'notmuch reply' to a multipart message with json format"
>  notmuch reply --format=json 'id:[hidden email]' | notmuch_json_show_sanitize >OUTPUT
> diff --git a/test/T240-dump-restore.sh b/test/T240-dump-restore.sh
> index 1f1f0866..75fb0b40 100755
> --- a/test/T240-dump-restore.sh
> +++ b/test/T240-dump-restore.sh
> @@ -129,7 +129,7 @@ test_begin_subtest "Check for a safe set of message-ids"
>  notmuch search --output=messages from:cworth | sed s/^id:// > EXPECTED
>  notmuch search --output=messages from:cworth | sed s/^id:// |\
>   $TEST_DIRECTORY/hex-xcode --direction=encode > OUTPUT
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "format=batch-tag, dump sanity check."
>  NOTMUCH_DUMP_TAGS --format=sup from:cworth | cut -f1 -d' ' | \
> diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
> index 4ca081c8..ef599849 100755
> --- a/test/T310-emacs.sh
> +++ b/test/T310-emacs.sh
> @@ -14,7 +14,7 @@ test_expect_success "${TEST_EMACS} -Q --batch --load $TEST_DIRECTORY/test-lib.el
>  test_begin_subtest "Basic notmuch-hello view in emacs"
>  test_emacs '(notmuch-hello)
>      (test-output)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello
> +test_expect_equal_file $EXPECTED/notmuch-hello OUTPUT
>  
>  test_begin_subtest "Saved search with 0 results"
>  test_emacs '(let ((notmuch-show-empty-saved-searches t)
> @@ -24,20 +24,20 @@ test_emacs '(let ((notmuch-show-empty-saved-searches t)
>   ("empty" . "tag:doesnotexist"))))
>        (notmuch-hello)
>        (test-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-with-empty
> +test_expect_equal_file $EXPECTED/notmuch-hello-with-empty OUTPUT
>  
>  test_begin_subtest "No saved searches displayed (all with 0 results)"
>  test_emacs '(let ((notmuch-saved-searches
>     '\''(("empty" . "tag:doesnotexist"))))
>        (notmuch-hello)
>        (test-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-no-saved-searches
> +test_expect_equal_file $EXPECTED/notmuch-hello-no-saved-searches OUTPUT
>  
>  test_begin_subtest "Basic notmuch-search view in emacs"
>  test_emacs '(notmuch-search "tag:inbox")
>      (notmuch-test-wait)
>      (test-output)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-search-tag-inbox
> +test_expect_equal_file $EXPECTED/notmuch-search-tag-inbox OUTPUT
>  
>  test_begin_subtest "Incremental parsing of search results"
>  test_emacs "(ad-enable-advice 'notmuch-search-process-filter 'around 'pessimal)
> @@ -47,7 +47,7 @@ test_emacs "(ad-enable-advice 'notmuch-search-process-filter 'around 'pessimal)
>      (ad-disable-advice 'notmuch-search-process-filter 'around 'pessimal)
>      (ad-activate 'notmuch-search-process-filter)
>      (test-output)"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-search-tag-inbox
> +test_expect_equal_file $EXPECTED/notmuch-search-tag-inbox OUTPUT
>  
>  test_begin_subtest "Navigation of notmuch-hello to search results"
>  test_emacs '(notmuch-hello)
> @@ -56,34 +56,34 @@ test_emacs '(notmuch-hello)
>      (widget-button-press (1- (point)))
>      (notmuch-test-wait)
>      (test-output)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-view-inbox
> +test_expect_equal_file $EXPECTED/notmuch-hello-view-inbox OUTPUT
>  
>  test_begin_subtest "Basic notmuch-show view in emacs"
>  maildir_storage_thread=$(notmuch search --output=threads id:[hidden email])
>  test_emacs "(notmuch-show \"$maildir_storage_thread\")
>      (test-output)"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
> +test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage OUTPUT
>  
>  test_begin_subtest "Basic notmuch-show view in emacs default indentation"
>  maildir_storage_thread=$(notmuch search --output=threads id:[hidden email])
>  test_emacs "(let ((notmuch-show-indent-messages-width 1))
>        (notmuch-show \"$maildir_storage_thread\")
>        (test-output))"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
> +test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage OUTPUT
>  
>  test_begin_subtest "Basic notmuch-show view in emacs without indentation"
>  maildir_storage_thread=$(notmuch search --output=threads id:[hidden email])
>  test_emacs "(let ((notmuch-show-indent-messages-width 0))
>        (notmuch-show \"$maildir_storage_thread\")
>        (test-output))"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage-without-indentation
> +test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage-without-indentation OUTPUT
>  
>  test_begin_subtest "Basic notmuch-show view in emacs with fourfold indentation"
>  maildir_storage_thread=$(notmuch search --output=threads id:[hidden email])
>  test_emacs "(let ((notmuch-show-indent-messages-width 4))
>        (notmuch-show \"$maildir_storage_thread\")
>        (test-output))"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage-with-fourfold-indentation
> +test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage-with-fourfold-indentation OUTPUT
>  
>  test_begin_subtest "notmuch-show for message with invalid From"
>  add_message "[subject]=\"message-with-invalid-from\"" \
> @@ -100,7 +100,7 @@ Date: GENERATED_DATE
>  This is just a test message (#1)
>  EOF
>  notmuch_date_sanitize < OUTPUT.raw > OUTPUT
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Navigation of notmuch-search to thread view"
>  test_emacs '(notmuch-search "tag:inbox")
> @@ -110,7 +110,7 @@ test_emacs '(notmuch-search "tag:inbox")
>      (notmuch-search-show-thread)
>      (notmuch-test-wait)
>      (test-output)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
> +test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage OUTPUT
>  
>  test_begin_subtest "Add tag from search view"
>  os_x_darwin_thread=$(notmuch search --output=threads id:[hidden email])
> @@ -206,7 +206,7 @@ Content-Type: text/plain
>  
>  This is a test that messages are sent via SMTP
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Folding a long header when sending via (fake) SMTP"
>  long_subject="This is a long subject `echo {1..1000}`"
> @@ -284,7 +284,7 @@ Content-Type: text/plain
>  
>  This is a test that long headers are folded when messages are sent via SMTP
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Verify that sent messages are saved/searchable (via FCC)"
>  notmuch new > /dev/null
> @@ -301,7 +301,7 @@ To:
>  Subject:
>  --text follows this line--
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  # Make another FCC maildir specific for the next test
>  mkdir -p mail/sent-string/cur
> @@ -319,7 +319,7 @@ Subject:
>  Fcc: ${MAIL_DIR}/sent-string
>  --text follows this line--
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  # Make more FCC maildirs specific for the next test
>  mkdir -p mail/sent-list-match/cur
> @@ -342,7 +342,7 @@ Subject:
>  Fcc: ${MAIL_DIR}/sent-list-match
>  --text follows this line--
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  # Make another FCC maildir specific for the next test
>  mkdir -p mail/sent-list-catch-all/cur
> @@ -362,7 +362,7 @@ Subject:
>  Fcc: ${MAIL_DIR}/sent-list-catch-all
>  --text follows this line--
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "notmuch-fcc-dirs set to a list (no match)"
>  test_emacs "(let ((notmuch-fcc-dirs
> @@ -376,7 +376,7 @@ To:
>  Subject:
>  --text follows this line--
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Reply within emacs"
>  test_emacs '(let ((message-hidden-headers ''()))
> @@ -398,7 +398,7 @@ Notmuch Test Suite <[hidden email]> writes:
>  
>  > This is a test that messages are sent via SMTP
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Reply from alternate address within emacs"
>  add_message '[from]="Sender <[hidden email]>"' \
> @@ -421,7 +421,7 @@ Sender <[hidden email]> writes:
>  
>  > This is just a test message (#${gen_msg_cnt})
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Reply from address in named group list within emacs"
>  add_message '[from]="Sender <[hidden email]>"' \
> @@ -445,7 +445,7 @@ Sender <[hidden email]> writes:
>  
>  > This is just a test message (#${gen_msg_cnt})
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Reply within emacs to a multipart/mixed message"
>  test_emacs '(let ((message-hidden-headers ''()))
> @@ -506,7 +506,7 @@ Adrian Perez de Castro <[hidden email]> writes:
>  > [hidden email]
>  > http://notmuchmail.org/mailman/listinfo/notmuch
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Reply within emacs to a multipart/alternative message"
>  test_emacs '(let ((message-hidden-headers ''()))
> @@ -576,7 +576,7 @@ Alex Botero-Lowry <[hidden email]> writes:
>  > [hidden email]
>  > http://notmuchmail.org/mailman/listinfo/notmuch
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Reply within emacs to an html-only message"
>  add_message '[content-type]="text/html"' \
> @@ -597,7 +597,7 @@ Notmuch Test Suite <[hidden email]> writes:
>  
>  > Hi,This is an HTML test message.OK?
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Reply within emacs to message from self"
>  test_subtest_known_broken
> @@ -644,7 +644,7 @@ Notmuch Test Suite <[hidden email]> writes:
>  
>  > <#!part disposition=inline>
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Save attachment from within emacs using notmuch-show-save-attachments"
>  # save as archive to test that Emacs does not re-compress .gz
> @@ -691,7 +691,7 @@ test_begin_subtest "View raw message within emacs"
>  test_emacs '(notmuch-show "id:[hidden email]")
>      (notmuch-show-view-raw-message)
>      (test-output)'
> -test_expect_equal_file OUTPUT $EXPECTED/raw-message-cf0c4d-52ad0a
> +test_expect_equal_file $EXPECTED/raw-message-cf0c4d-52ad0a OUTPUT
>  
>  test_begin_subtest "Hiding/showing signature in notmuch-show view"
>  maildir_storage_thread=$(notmuch search --output=threads id:[hidden email])
> @@ -701,7 +701,7 @@ test_emacs "(notmuch-show \"$maildir_storage_thread\")
>      (search-backward \"Click/Enter to hide.\")
>      (button-activate (button-at (point)))
>      (test-output)"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
> +test_expect_equal_file $EXPECTED/notmuch-show-thread-maildir-storage OUTPUT
>  
>  test_begin_subtest "Detection and hiding of top-post quoting of message"
>  add_message '[subject]="The problem with top-posting"' \
> @@ -749,13 +749,13 @@ Thanks for the advice! I will be sure to put it to good use.
>  
>  [ 9-line hidden original message. Click/Enter to show. ]" > EXPECTED
>  notmuch_date_sanitize < OUTPUT.raw > OUTPUT
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Hiding message in notmuch-show view"
>  test_emacs '(notmuch-show "id:[hidden email]")
>      (notmuch-show-toggle-message)
>      (test-visible-output)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-hidden-messages
> +test_expect_equal_file $EXPECTED/notmuch-show-thread-with-hidden-messages OUTPUT
>  
>  test_begin_subtest "Hiding message with visible citation in notmuch-show view"
>  test_emacs '(notmuch-show "id:[hidden email]")
> @@ -763,7 +763,7 @@ test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.
>      (button-activate (button-at (point)))
>      (notmuch-show-toggle-message)
>      (test-visible-output)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-hidden-messages
> +test_expect_equal_file $EXPECTED/notmuch-show-thread-with-hidden-messages OUTPUT
>  
>  test_begin_subtest "notmuch-show: show message headers"
>  test_emacs \
> @@ -771,7 +771,7 @@ test_emacs \
>         (notmuch-message-headers-visible t))
>     (notmuch-show "id:[hidden email]")
>     (test-visible-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-message-with-headers-visible
> +test_expect_equal_file $EXPECTED/notmuch-show-message-with-headers-visible OUTPUT
>  
>  test_begin_subtest "notmuch-show: hide message headers"
>  test_emacs \
> @@ -779,7 +779,7 @@ test_emacs \
>         (notmuch-message-headers-visible nil))
>     (notmuch-show "id:[hidden email]")
>     (test-visible-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-message-with-headers-hidden
> +test_expect_equal_file $EXPECTED/notmuch-show-message-with-headers-hidden OUTPUT
>  
>  test_begin_subtest "notmuch-show: hide message headers (w/ notmuch-show-toggle-visibility-headers)"
>  test_emacs \
> @@ -788,20 +788,20 @@ test_emacs \
>     (notmuch-show "id:[hidden email]")
>     (notmuch-show-toggle-visibility-headers)
>     (test-visible-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-message-with-headers-hidden
> +test_expect_equal_file $EXPECTED/notmuch-show-message-with-headers-hidden OUTPUT
>  
>  test_begin_subtest "notmuch-show: collapse all messages in thread"
>  test_emacs '(notmuch-show "id:[hidden email]")
>   (let ((current-prefix-arg t))
>    (notmuch-show-open-or-close-all)
>    (test-visible-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-all-messages-collapsed
> +test_expect_equal_file $EXPECTED/notmuch-show-thread-with-all-messages-collapsed OUTPUT
>  
>  test_begin_subtest "notmuch-show: uncollapse all messages in thread"
>  test_emacs '(notmuch-show "id:[hidden email]")
>   (notmuch-show-open-or-close-all)
>   (test-visible-output)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-with-all-messages-uncollapsed
> +test_expect_equal_file $EXPECTED/notmuch-show-thread-with-all-messages-uncollapsed OUTPUT
>  
>  test_begin_subtest "Stashing in notmuch-show"
>  add_message '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' \
> @@ -847,7 +847,7 @@ http://mid.gmane.org/bought
>  https://marc.info/?i=bought
>  https://mid.mail-archive.com/bought
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Stashing in notmuch-search"
>  test_emacs '(notmuch-search "id:\"bought\"")
> @@ -872,14 +872,14 @@ test_emacs "(notmuch-search \"$message1 or $message2\")
>      (redisplay)
>      (notmuch-show-advance-and-archive)
>      (test-output)"
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Refresh show buffer"
>  test_emacs '(notmuch-show "id:[hidden email]")
>      (test-visible-output "EXPECTED")
>      (notmuch-show-refresh-view)
>      (test-visible-output)'
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Refresh modified show buffer"
>  test_emacs '(notmuch-show "id:[hidden email]")
> @@ -889,7 +889,7 @@ test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.
>      (test-visible-output "EXPECTED")
>      (notmuch-show-refresh-view)
>      (test-visible-output)'
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Do not call notmuch for non-inlinable application/mpeg parts"
>  id='message-with-application/[hidden email]'
> diff --git a/test/T320-emacs-large-search-buffer.sh b/test/T320-emacs-large-search-buffer.sh
> index 3fd6958a..e9d5e358 100755
> --- a/test/T320-emacs-large-search-buffer.sh
> +++ b/test/T320-emacs-large-search-buffer.sh
> @@ -27,6 +27,6 @@ test_emacs '(notmuch-search "*")
>      (notmuch-test-wait)
>      (test-output)'
>  sed -i -e s',  *, ,g' -e 's/xxx*/[BLOB]/g' OUTPUT
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_done
> diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh
> index 3cf644df..b7d3a2cf 100755
> --- a/test/T350-crypto.sh
> +++ b/test/T350-crypto.sh
> @@ -233,7 +233,7 @@ notmuch show \
>      --part=5 \
>      --decrypt \
>      subject:"test encrypted message 001" >OUTPUT
> -test_expect_equal_file OUTPUT TESTATTACHMENT
> +test_expect_equal_file TESTATTACHMENT OUTPUT
>  
>  test_begin_subtest "decryption failure with missing key"
>  mv "${GNUPGHOME}"{,.bak}
> diff --git a/test/T370-search-folder-coherence.sh b/test/T370-search-folder-coherence.sh
> index da4ec2b8..d1cb45ec 100755
> --- a/test/T370-search-folder-coherence.sh
> +++ b/test/T370-search-folder-coherence.sh
> @@ -28,7 +28,7 @@ MAIL_DIR/msg-001
>  MAIL_DIR/spam/msg-001
>  EOF
>  notmuch search --output=files id:$id_x | notmuch_search_files_sanitize >OUTPUT
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Test matches folder:spam"
>  output=$(notmuch search folder:spam)
> diff --git a/test/T390-python.sh b/test/T390-python.sh
> index b27f0740..a9a61145 100755
> --- a/test/T390-python.sh
> +++ b/test/T390-python.sh
> @@ -16,7 +16,7 @@ for t in q_new.search_threads():
>      print (t.get_thread_id())
>  EOF
>  notmuch search --sort=oldest-first --output=threads tag:inbox | sed s/^thread:// > EXPECTED
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "compare message ids"
>  test_python <<EOF
> @@ -28,7 +28,7 @@ for m in q_new.search_messages():
>      print (m.get_message_id())
>  EOF
>  notmuch search --sort=oldest-first --output=messages tag:inbox | sed s/^id:// > EXPECTED
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "get non-existent file"
>  test_python <<EOF
> diff --git a/test/T395-ruby.sh b/test/T395-ruby.sh
> index 20e06917..52f9fe0f 100755
> --- a/test/T395-ruby.sh
> +++ b/test/T395-ruby.sh
> @@ -23,7 +23,7 @@ for t in @q.search_threads do
>  end
>  EOF
>  notmuch search --sort=oldest-first --output=threads tag:inbox | sed s/^thread:// > EXPECTED
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "compare message ids"
>  test_ruby <<"EOF"
> @@ -40,7 +40,7 @@ for m in @q.search_messages do
>  end
>  EOF
>  notmuch search --sort=oldest-first --output=messages tag:inbox | sed s/^id:// > EXPECTED
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "get non-existent file"
>  test_ruby <<"EOF"
> @@ -67,7 +67,7 @@ end
>  print @q.count_messages(),"\n"
>  EOF
>  notmuch count --output=messages tag:inbox > EXPECTED
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "count threads"
>  test_ruby <<"EOF"
> @@ -81,7 +81,7 @@ end
>  print @q.count_threads(),"\n"
>  EOF
>  notmuch count --output=threads tag:inbox > EXPECTED
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "get all tags"
>  test_ruby <<"EOF"
> @@ -97,6 +97,6 @@ for tag in @t do
>  end
>  EOF
>  notmuch search --output=tags '*' > EXPECTED
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_done
> diff --git a/test/T410-argument-parsing.sh b/test/T410-argument-parsing.sh
> index f8ff8ff9..fad134e3 100755
> --- a/test/T410-argument-parsing.sh
> +++ b/test/T410-argument-parsing.sh
> @@ -12,6 +12,6 @@ string foo
>  positional arg 1 pos1
>  positional arg 2 pos2
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_done
> diff --git a/test/T440-emacs-hello.sh b/test/T440-emacs-hello.sh
> index a8ed2282..ac214a5b 100755
> --- a/test/T440-emacs-hello.sh
> +++ b/test/T440-emacs-hello.sh
> @@ -13,7 +13,7 @@ test_emacs "(let ((notmuch-hello-sections
>                                       \"Test\" '((\"inbox\" . \"tag:inbox\")))))))
>             (notmuch-hello)
>             (test-output))"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-new-section
> +test_expect_equal_file $EXPECTED/notmuch-hello-new-section OUTPUT
>  
>  test_begin_subtest "User-defined section with empty, hidden entry"
>  test_emacs "(let ((notmuch-hello-sections
> @@ -24,7 +24,7 @@ test_emacs "(let ((notmuch-hello-sections
>                                       :hide-empty-searches t)))))
>               (notmuch-hello)
>               (test-output))"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-with-empty
> +test_expect_equal_file $EXPECTED/notmuch-hello-section-with-empty OUTPUT
>  
>  test_begin_subtest "User-defined section, unread tag filtered out"
>  test_emacs "(let ((notmuch-hello-sections
> @@ -33,7 +33,7 @@ test_emacs "(let ((notmuch-hello-sections
>                                       :hide-tags '(\"unread\"))))))
>               (notmuch-hello)
>               (test-output))"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-hidden-tag
> +test_expect_equal_file $EXPECTED/notmuch-hello-section-hidden-tag OUTPUT
>  
>  test_begin_subtest "User-defined section, different query for counts"
>  test_emacs "(let ((notmuch-hello-sections
> @@ -42,21 +42,21 @@ test_emacs "(let ((notmuch-hello-sections
>                                       :filter-count \"tag:signed\")))))
>               (notmuch-hello)
>               (test-output))"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-section-counts
> +test_expect_equal_file $EXPECTED/notmuch-hello-section-counts OUTPUT
>  
>  test_begin_subtest "Empty custom tags section"
>  test_emacs "(let* ((widget (widget-create 'notmuch-hello-tags-section))
>                     (notmuch-hello-sections (list (widget-value widget))))
>               (notmuch-hello)
>               (test-output))"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-empty-custom-tags-section
> +test_expect_equal_file $EXPECTED/notmuch-hello-empty-custom-tags-section OUTPUT
>  
>  test_begin_subtest "Empty custom queries section"
>  test_emacs "(let* ((widget (widget-create 'notmuch-hello-query-section))
>                     (notmuch-hello-sections (list (widget-value widget))))
>               (notmuch-hello)
>               (test-output))"
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-empty-custom-queries-section
> +test_expect_equal_file $EXPECTED/notmuch-hello-empty-custom-queries-section OUTPUT
>  
>  test_begin_subtest "Column alignment for tag/queries with long names"
>  tag=a-very-long-tag # length carefully calculated for 80 characters window width
> @@ -64,6 +64,6 @@ notmuch tag +$tag '*'
>  test_emacs '(notmuch-hello)
>              (test-output)'
>  notmuch tag -$tag '*'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-hello-long-names
> +test_expect_equal_file $EXPECTED/notmuch-hello-long-names OUTPUT
>  
>  test_done
> diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
> index 0342a874..74d546bd 100755
> --- a/test/T450-emacs-show.sh
> +++ b/test/T450-emacs-show.sh
> @@ -27,7 +27,7 @@ EOF
>  test_emacs "(notmuch-show \"id:$message_id\")
>      (test-visible-output \"OUTPUT.raw\")"
>  notmuch_date_sanitize < OUTPUT.raw > OUTPUT
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "Bare subject #1"
>  output=$(test_emacs '(notmuch-show-strip-re "Re: subject")')
> @@ -45,20 +45,20 @@ test_begin_subtest "don't process cryptographic MIME parts"
>  test_emacs '(let ((notmuch-crypto-process-mime nil))
>   (notmuch-show "id:[hidden email]")
>   (test-visible-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-off
> +test_expect_equal_file $EXPECTED/notmuch-show-process-crypto-mime-parts-off OUTPUT
>  
>  test_begin_subtest "process cryptographic MIME parts"
>  test_emacs '(let ((notmuch-crypto-process-mime t))
>   (notmuch-show "id:[hidden email]")
>   (test-visible-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on
> +test_expect_equal_file $EXPECTED/notmuch-show-process-crypto-mime-parts-on OUTPUT
>  
>  test_begin_subtest "process cryptographic MIME parts (w/ notmuch-show-toggle-process-crypto)"
>  test_emacs '(let ((notmuch-crypto-process-mime nil))
>   (notmuch-show "id:[hidden email]")
>   (notmuch-show-toggle-process-crypto)
>   (test-visible-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-process-crypto-mime-parts-on
> +test_expect_equal_file $EXPECTED/notmuch-show-process-crypto-mime-parts-on OUTPUT
>  
>  test_begin_subtest "notmuch-show: don't elide non-matching messages"
>  test_emacs '(let ((notmuch-show-only-matching-messages nil))
> @@ -67,7 +67,7 @@ test_emacs '(let ((notmuch-show-only-matching-messages nil))
>   (notmuch-search-show-thread)
>   (notmuch-test-wait)
>   (test-visible-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-off
> +test_expect_equal_file $EXPECTED/notmuch-show-elide-non-matching-messages-off OUTPUT
>  
>  test_begin_subtest "notmuch-show: elide non-matching messages"
>  test_emacs '(let ((notmuch-show-only-matching-messages t))
> @@ -76,7 +76,7 @@ test_emacs '(let ((notmuch-show-only-matching-messages 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_expect_equal_file $EXPECTED/notmuch-show-elide-non-matching-messages-on OUTPUT
>  
>  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))
> @@ -86,7 +86,7 @@ test_emacs '(let ((notmuch-show-only-matching-messages nil))
>   (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_expect_equal_file $EXPECTED/notmuch-show-elide-non-matching-messages-on OUTPUT
>  
>  test_begin_subtest "notmuch-show: elide non-matching messages (w/ prefix arg to notmuch-show)"
>  test_emacs '(let ((notmuch-show-only-matching-messages nil))
> @@ -95,7 +95,7 @@ test_emacs '(let ((notmuch-show-only-matching-messages nil))
>   (notmuch-search-show-thread t)
>   (notmuch-test-wait)
>   (test-visible-output))'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-elide-non-matching-messages-on
> +test_expect_equal_file $EXPECTED/notmuch-show-elide-non-matching-messages-on OUTPUT
>  
>  test_begin_subtest "notmuch-show: disable indentation of thread content (w/ notmuch-show-toggle-thread-indentation)"
>  test_emacs '(notmuch-search "from:[hidden email] and subject:\"Maildir storage\"")
> @@ -104,7 +104,7 @@ test_emacs '(notmuch-search "from:[hidden email] and subject:\"Maildir st
>   (notmuch-test-wait)
>   (notmuch-show-toggle-thread-indentation)
>   (test-visible-output)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-indent-thread-content-off
> +test_expect_equal_file $EXPECTED/notmuch-show-indent-thread-content-off OUTPUT
>  
>  test_begin_subtest "id buttonization"
>  add_message '[body]="
> @@ -161,7 +161,7 @@ cid:xxx
>  <<mid:abc>>. <<mid:abc>>, <<mid:abc>>;
>  EOF
>  notmuch_date_sanitize < OUTPUT.raw > OUTPUT
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  
>  test_begin_subtest "Show handles subprocess errors"
> diff --git a/test/T455-emacs-charsets.sh b/test/T455-emacs-charsets.sh
> index 7624fa4d..5d6d53a8 100755
> --- a/test/T455-emacs-charsets.sh
> +++ b/test/T455-emacs-charsets.sh
> @@ -48,7 +48,7 @@ awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT
>  cat <<EOF >EXPECTED
>  Yen: $UTF8_YEN
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "8bit text parts are decoded when rendering"
>  test_emacs '(notmuch-show "id:[hidden email]")
> @@ -57,7 +57,7 @@ awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT
>  cat <<EOF >EXPECTED
>  Yen: $UTF8_YEN
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "HTML parts are decoded when rendering"
>  test_emacs '(notmuch-show "id:[hidden email]")
> @@ -67,7 +67,7 @@ cat <<EOF >EXPECTED
>  [ text/html ]
>  Yen: $UTF8_YEN
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  # Test saving
>  
> @@ -125,7 +125,7 @@ awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT
>  cat <<EOF >EXPECTED
>  Yen: =A2=44
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "8bit text message are not decoded when viewing"
>  test_emacs '(notmuch-show "id:[hidden email]")
> @@ -135,6 +135,6 @@ awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT
>  cat <<EOF >EXPECTED
>  Yen: $BIG5_YEN
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_done
> diff --git a/test/T460-emacs-tree.sh b/test/T460-emacs-tree.sh
> index b6181b51..76ababfd 100755
> --- a/test/T460-emacs-tree.sh
> +++ b/test/T460-emacs-tree.sh
> @@ -12,7 +12,7 @@ test_emacs '(notmuch-tree "tag:inbox")
>      (notmuch-test-wait)
>      (test-output)
>      (delete-other-windows)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
> +test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT
>  
>  test_begin_subtest "Refreshed notmuch-tree view in emacs"
>  test_emacs '(notmuch-tree "tag:inbox")
> @@ -21,7 +21,7 @@ test_emacs '(notmuch-tree "tag:inbox")
>      (notmuch-test-wait)
>      (test-output)
>      (delete-other-windows)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
> +test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT
>  
>  # In the following tag tests we make sure the display is updated
>  # correctly and, in a separate test, that the database is updated
> @@ -34,7 +34,7 @@ test_emacs '(notmuch-tree "tag:inbox")
>      (notmuch-tree-tag (list "+test_tag"))
>      (test-output)
>      (delete-other-windows)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-tagged
> +test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox-tagged OUTPUT
>  
>  test_begin_subtest "Tag message in notmuch tree view (database)"
>  output=$(notmuch search --output=messages 'tag:test_tag')
> @@ -47,7 +47,7 @@ test_emacs '(notmuch-tree "tag:inbox")
>      (notmuch-tree-tag (list "-test_tag"))
>      (test-output)
>      (delete-other-windows)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
> +test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT
>  
>  test_begin_subtest "Untag message in notmuch tree view (database)"
>  output=$(notmuch search --output=messages 'tag:test_tag')
> @@ -61,7 +61,7 @@ test_emacs '(notmuch-tree "tag:inbox")
>      (notmuch-tree-tag-thread (list "+test_thread_tag"))
>      (test-output)
>      (delete-other-windows)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-thread-tagged
> +test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox-thread-tagged OUTPUT
>  
>  test_begin_subtest "Tag message in notmuch tree view (database)"
>  output=$(notmuch search --output=messages 'tag:test_thread_tag')
> @@ -82,7 +82,7 @@ test_emacs '(notmuch-tree "tag:inbox")
>      (notmuch-tree-tag-thread (list "-test_thread_tag"))
>      (test-output)
>      (delete-other-windows)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
> +test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT
>  
>  test_begin_subtest "Untag message in notmuch tree view (database)"
>  output=$(notmuch search --output=messages 'tag:test_thread_tag')
> @@ -98,7 +98,7 @@ test_emacs '(notmuch-hello)
>      (notmuch-test-wait)
>      (test-output)
>      (delete-other-windows)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
> +test_expect_equal_file $EXPECTED/notmuch-tree-tag-inbox OUTPUT
>  
>  test_begin_subtest "Tree view of a single thread (from search)"
>  test_emacs '(notmuch-hello)
> @@ -110,7 +110,7 @@ test_emacs '(notmuch-hello)
>      (notmuch-test-wait)
>      (test-output)
>      (delete-other-windows)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
> +test_expect_equal_file $EXPECTED/notmuch-tree-single-thread OUTPUT
>  
>  test_begin_subtest "Tree view of a single thread (from show)"
>  test_emacs '(notmuch-hello)
> @@ -123,7 +123,7 @@ test_emacs '(notmuch-hello)
>      (notmuch-test-wait)
>      (test-output)
>      (delete-other-windows)'
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
> +test_expect_equal_file $EXPECTED/notmuch-tree-single-thread OUTPUT
>  
>  test_begin_subtest "Message window of tree view"
>  test_emacs '(notmuch-hello)
> @@ -138,7 +138,7 @@ test_emacs '(notmuch-hello)
>      (test-output)
>      (delete-other-windows)'
>  cp OUTPUT /tmp/mjwout
> -test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-show-window
> +test_expect_equal_file $EXPECTED/notmuch-tree-show-window OUTPUT
>  
>  test_begin_subtest "Stash id"
>  output=$(test_emacs '(notmuch-tree "id:1258498485-sup-142@elly")
> diff --git a/test/T480-hex-escaping.sh b/test/T480-hex-escaping.sh
> index 10527b18..86cf3729 100755
> --- a/test/T480-hex-escaping.sh
> +++ b/test/T480-hex-escaping.sh
> @@ -5,7 +5,7 @@ test_description="hex encoding and decoding"
>  test_begin_subtest "round trip"
>  find $TEST_DIRECTORY/corpus -type f -print | sort | xargs cat > EXPECTED
>  $TEST_DIRECTORY/hex-xcode --direction=encode < EXPECTED | $TEST_DIRECTORY/hex-xcode --direction=decode > OUTPUT
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "punctuation"
>  tag1='comic_swear=$&^%$^%\\//-+$^%$'
> @@ -28,7 +28,7 @@ test_begin_subtest "round trip (in-place)"
>  find $TEST_DIRECTORY/corpus -type f -print | sort | xargs cat > EXPECTED
>  $TEST_DIRECTORY/hex-xcode --in-place --direction=encode < EXPECTED |\
>       $TEST_DIRECTORY/hex-xcode --in-place --direction=decode > OUTPUT
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_begin_subtest "punctuation (in-place)"
>  tag1='comic_swear=$&^%$^%\\//-+$^%$'
> diff --git a/test/T500-search-date.sh b/test/T500-search-date.sh
> index 198a2e60..f10207f8 100755
> --- a/test/T500-search-date.sh
> +++ b/test/T500-search-date.sh
> @@ -26,6 +26,6 @@ thread:XXX   2009-11-18 [1/2] Carl Worth| Jan Janak; [notmuch] [PATCH] Older ver
>  thread:XXX   2009-11-18 [1/3] Carl Worth| Aron Griffis, Keith Packard; [notmuch] archive (inbox unread)
>  thread:XXX   2009-11-18 [1/2] Carl Worth| Keith Packard; [notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox unread)
>  EOF
> -test_expect_equal_file OUTPUT EXPECTED
> +test_expect_equal_file EXPECTED OUTPUT
>  
>  test_done
> --
> 2.11.0
>
> _______________________________________________
> notmuch mailing list
> [hidden email]
> https://notmuchmail.org/mailman/listinfo/notmuch
_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

[PATCH] test: swap order of arguments of test_expect_equal

In reply to this post by David Bremner-2
For some reason (probably inherited from git), the order arguments for
test_expect_equal was "$output $expected"; this again matters when
generating diffs.
---

I'm less sure about this one so I didn't go through and update all of
the tests.  The existing use of test_expect_equal is mostly "$output"
"$expected", which is natural enough, except that it's the opposite of
the convention for test_expect_equal_file that I thought was obvious
(I guess the latter motivated by the arguments to diff).

 test/T000-basic.sh                         | 4 ++--
 test/test-lib.sh                           | 5 +++--
 test/test.expected-output/test-verbose-no  | 4 ++--
 test/test.expected-output/test-verbose-yes | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/test/T000-basic.sh b/test/T000-basic.sh
index 36a7ca4c..0d6a2081 100755
--- a/test/T000-basic.sh
+++ b/test/T000-basic.sh
@@ -52,7 +52,7 @@ suppress_diff_date() {
 test_begin_subtest "Ensure that test output is suppressed unless the test fails"
 output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose 2>&1 | suppress_diff_date)
 expected=$(cat $EXPECTED/test-verbose-no | suppress_diff_date)
-test_expect_equal "$output" "$expected"
+test_expect_equal "$expected" "$output"
 
 test_begin_subtest "Ensure that -v does not suppress test output"
 output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose -v 2>&1 | suppress_diff_date)
@@ -60,7 +60,7 @@ expected=$(cat $EXPECTED/test-verbose-yes | suppress_diff_date)
 # Do not include the results of test-verbose in totals
 rm $TEST_DIRECTORY/test-results/test-verbose
 rm -r $TEST_DIRECTORY/tmp.test-verbose
-test_expect_equal "$output" "$expected"
+test_expect_equal "$expected" "$output"
 
 
 ################################################################
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 988b00af..374f6da5 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -566,8 +566,9 @@ test_expect_equal ()
  test "$#" = 2 ||
  error "bug in the test script: not 2 parameters to test_expect_equal"
 
- output="$1"
- expected="$2"
+ expected="$1"
+ output="$2"
+
  if ! test_skip "$test_subtest_name"
  then
  if [ "$output" = "$expected" ]; then
diff --git a/test/test.expected-output/test-verbose-no b/test/test.expected-output/test-verbose-no
index 1a2ff619..07004182 100644
--- a/test/test.expected-output/test-verbose-no
+++ b/test/test.expected-output/test-verbose-no
@@ -14,8 +14,8 @@ hello stderr
  --- test-verbose.4.expected 2010-11-14 21:41:12.738189710 +0000
  +++ test-verbose.4.output 2010-11-14 21:41:12.738189710 +0000
  @@ -1 +1 @@
- -b
- +a
+ -a
+ +b
 hello stdout
 hello stderr
 
diff --git a/test/test.expected-output/test-verbose-yes b/test/test.expected-output/test-verbose-yes
index d25466e9..639b7fa7 100644
--- a/test/test.expected-output/test-verbose-yes
+++ b/test/test.expected-output/test-verbose-yes
@@ -20,6 +20,6 @@ hello stderr
  --- test-verbose.4.expected 2010-11-14 21:41:06.650023289 +0000
  +++ test-verbose.4.output 2010-11-14 21:41:06.650023289 +0000
  @@ -1 +1 @@
- -b
- +a
+ -a
+ +b
 
--
2.11.0

_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch
Tomi Ollila-2 Tomi Ollila-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] test: swap order of arguments of test_expect_equal

On Thu, Apr 06 2017, David Bremner <[hidden email]> wrote:

> For some reason (probably inherited from git), the order arguments for
> test_expect_equal was "$output $expected"; this again matters when
> generating diffs.
> ---

IMO these both of these should use expected - output argument order.

But more important than that is to get
id:[hidden email] merged soon so confusion
of output ends and if someone(tm) is doing near-future test changes
risk of collisions can be avoided.

Tomi


>
> I'm less sure about this one so I didn't go through and update all of
> the tests.  The existing use of test_expect_equal is mostly "$output"
> "$expected", which is natural enough, except that it's the opposite of
> the convention for test_expect_equal_file that I thought was obvious
> (I guess the latter motivated by the arguments to diff).
>
>  test/T000-basic.sh                         | 4 ++--
>  test/test-lib.sh                           | 5 +++--
>  test/test.expected-output/test-verbose-no  | 4 ++--
>  test/test.expected-output/test-verbose-yes | 4 ++--
>  4 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/test/T000-basic.sh b/test/T000-basic.sh
> index 36a7ca4c..0d6a2081 100755
> --- a/test/T000-basic.sh
> +++ b/test/T000-basic.sh
> @@ -52,7 +52,7 @@ suppress_diff_date() {
>  test_begin_subtest "Ensure that test output is suppressed unless the test fails"
>  output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose 2>&1 | suppress_diff_date)
>  expected=$(cat $EXPECTED/test-verbose-no | suppress_diff_date)
> -test_expect_equal "$output" "$expected"
> +test_expect_equal "$expected" "$output"
>  
>  test_begin_subtest "Ensure that -v does not suppress test output"
>  output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose -v 2>&1 | suppress_diff_date)
> @@ -60,7 +60,7 @@ expected=$(cat $EXPECTED/test-verbose-yes | suppress_diff_date)
>  # Do not include the results of test-verbose in totals
>  rm $TEST_DIRECTORY/test-results/test-verbose
>  rm -r $TEST_DIRECTORY/tmp.test-verbose
> -test_expect_equal "$output" "$expected"
> +test_expect_equal "$expected" "$output"
>  
>  
>  ################################################################
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index 988b00af..374f6da5 100644
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -566,8 +566,9 @@ test_expect_equal ()
>   test "$#" = 2 ||
>   error "bug in the test script: not 2 parameters to test_expect_equal"
>  
> - output="$1"
> - expected="$2"
> + expected="$1"
> + output="$2"
> +
>   if ! test_skip "$test_subtest_name"
>   then
>   if [ "$output" = "$expected" ]; then
> diff --git a/test/test.expected-output/test-verbose-no b/test/test.expected-output/test-verbose-no
> index 1a2ff619..07004182 100644
> --- a/test/test.expected-output/test-verbose-no
> +++ b/test/test.expected-output/test-verbose-no
> @@ -14,8 +14,8 @@ hello stderr
>   --- test-verbose.4.expected 2010-11-14 21:41:12.738189710 +0000
>   +++ test-verbose.4.output 2010-11-14 21:41:12.738189710 +0000
>   @@ -1 +1 @@
> - -b
> - +a
> + -a
> + +b
>  hello stdout
>  hello stderr
>  
> diff --git a/test/test.expected-output/test-verbose-yes b/test/test.expected-output/test-verbose-yes
> index d25466e9..639b7fa7 100644
> --- a/test/test.expected-output/test-verbose-yes
> +++ b/test/test.expected-output/test-verbose-yes
> @@ -20,6 +20,6 @@ hello stderr
>   --- test-verbose.4.expected 2010-11-14 21:41:06.650023289 +0000
>   +++ test-verbose.4.output 2010-11-14 21:41:06.650023289 +0000
>   @@ -1 +1 @@
> - -b
> - +a
> + -a
> + +b
>  
> --
> 2.11.0
>
> _______________________________________________
> notmuch mailing list
> [hidden email]
> https://notmuchmail.org/mailman/listinfo/notmuch
_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] test: swap order of arguments of test_expect_equal

Tomi Ollila <[hidden email]> writes:

> On Thu, Apr 06 2017, David Bremner <[hidden email]> wrote:
>
>> For some reason (probably inherited from git), the order arguments for
>> test_expect_equal was "$output $expected"; this again matters when
>> generating diffs.
>> ---
>
> IMO these both of these should use expected - output argument order.
>
> But more important than that is to get
> id:[hidden email] merged soon so confusion
> of output ends and if someone(tm) is doing near-future test changes
> risk of collisions can be avoided.

OK, pushed the first two to master.

d
_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch