test: sort the output of the "prefix" test in T610-message-property

[notmuch] / test / T470-missing-headers.sh

diff --git a/test/T470-missing-headers.sh b/test/T470-missing-headers.sh
index e256c10ac47a8f370cd42e95eb0bcafbd20b4845..32b070ec80a45065d335c22158e75db73226d36c 100755 (executable)
--- a/test/T470-missing-headers.sh
+++ b/test/T470-missing-headers.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 test_description='messages with missing headers'
-. ./test-lib.sh || exit 1
+. $(dirname "$0")/test-lib.sh || exit 1
 
 # Notmuch requires at least one of from, subject, or to or it will
 # ignore the file.  Generate two messages so that together they cover
@@ -20,12 +20,12 @@ From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Body
 EOF
 
-NOTMUCH_NEW
+NOTMUCH_NEW >/dev/null
 
 test_begin_subtest "Search: text"
 output=$(notmuch search '*' | notmuch_search_sanitize)
 test_expect_equal "$output" "\
-thread:XXX   2001-01-05 [1/1] (null);  (inbox unread)
+thread:XXX   2001-01-05 [1/1] ;  (inbox unread)
 thread:XXX   1970-01-01 [1/1] Notmuch Test Suite;  (inbox unread)"
 
 test_begin_subtest "Search: json"
@@ -107,9 +107,10 @@ expected=$(notmuch_json_show_sanitize <<EOF
                         "id": 1
                     }
                 ],
+                "crypto": {},
                 "date_relative": "2001-01-05",
                 "excluded": false,
-                "filename": "YYYYY",
+                "filename": ["YYYYY"],
                 "headers": {
                     "Date": "Fri, 05 Jan 2001 15:43:57 +0000",
                     "From": "",
@@ -137,9 +138,10 @@ expected=$(notmuch_json_show_sanitize <<EOF
                         "id": 1
                     }
                 ],
+                "crypto": {},
                 "date_relative": "1970-01-01",
                 "excluded": false,
-                "filename": "YYYYY",
+                "filename": ["YYYYY"],
                 "headers": {
                     "Date": "Thu, 01 Jan 1970 00:00:00 +0000",
                     "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",