X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FT355-smime.sh;h=b813b6cad2e5d646dcf2a669c4108e85eafaed90;hb=a8cd1ec26b7ed1144c46417091a5b95c9dd201ad;hp=639ca697c734f6e5f82d51a522fe756a6c40eac9;hpb=c0c5645538d9dda84657602ee4189f4ff3ca1aeb;p=notmuch

diff --git a/test/T355-smime.sh b/test/T355-smime.sh
index 639ca697..b813b6ca 100755
--- a/test/T355-smime.sh
+++ b/test/T355-smime.sh
@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
 
 test_description='S/MIME signature verification and decryption'
-. ./test-lib.sh || exit 1
+. $(dirname "$0")/test-lib.sh || exit 1
 
 add_gpgsm_home ()
 {
     local fpr
     [ -d ${GNUPGHOME} ] && return
+    _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }
+    at_exit_function _gnupg_exit
     mkdir -m 0700 "$GNUPGHOME"
     gpgsm --no-tty --no-common-certs-import --disable-dirmngr --import < $TEST_DIRECTORY/smime/test.crt >"$GNUPGHOME"/import.log 2>&1
     fpr=$(gpgsm  --list-key test_suite@notmuchmail.org | sed -n 's/.*fingerprint: //p')
@@ -62,8 +64,8 @@ expected='[[[{"id": "XXXXX",
  "To": "test_suite@notmuchmail.org",
  "Date": "Sat, 01 Jan 2000 12:00:00 +0000"},
  "body": [{"id": 1,
- "sigstatus": [{"status": "good",
- "fingerprint": "'$FINGERPRINT'",
+ "sigstatus": [{"fingerprint": "'$FINGERPRINT'",
+ "status": "good",
  "expires": 424242424,
  "created": 946728000}],
  "content-type": "multipart/signed",