exit lingering gpg agents at the end of relevant tests

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

diff --git a/test/T470-missing-headers.sh b/test/T470-missing-headers.sh
index cb38301c255a1d0b8dd661636499930862fd5b7f..32031e3174d3005413ac0d652b0654f30cfed21f 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
+. ./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,7 +20,7 @@ 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)
@@ -109,7 +109,7 @@ expected=$(notmuch_json_show_sanitize <<EOF
                 ],
                 "date_relative": "2001-01-05",
                 "excluded": false,
-                "filename": "YYYYY",
+                "filename": ["YYYYY"],
                 "headers": {
                     "Date": "Fri, 05 Jan 2001 15:43:57 +0000",
                     "From": "",
@@ -139,7 +139,7 @@ expected=$(notmuch_json_show_sanitize <<EOF
                 ],
                 "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>",