X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2FT350-crypto.sh;h=2f793e96720fcda9727a8ad6444b52fd920cc182;hb=570349e132da5e19b36a004e633b870cec810170;hp=761ff55344d5c7a13984c4fb6396c9d7f973cc74;hpb=8ea4a99d74737929f58568505e41c94f65a14743;p=notmuch diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh index 761ff553..2f793e96 100755 --- a/test/T350-crypto.sh +++ b/test/T350-crypto.sh @@ -10,8 +10,6 @@ test_description='PGP/MIME signature verification and decryption' ################################################## add_gnupg_home -# Change this if we ship a new test key -FINGERPRINT="5AEAB11F5E33DCE875DDB75B6D92612D94E46381" test_begin_subtest "emacs delivery of signed message" test_expect_success \ @@ -271,7 +269,6 @@ expected='[[[{"id": "XXXXX", "Date": "Sat, 01 Jan 2000 12:00:00 +0000"}, "body": [{"id": 1, "encstatus": [{"status": "good"}], - "sigstatus": [], "content-type": "multipart/encrypted", "content": [{"id": 2, "content-type": "application/pgp-encrypted", @@ -384,10 +381,11 @@ test_expect_equal_json \ "$expected" test_begin_subtest "reply to encrypted message" -output=$(notmuch reply --decrypt subject:"test encrypted message 002" \ +output=$(notmuch reply --decrypt=true subject:"test encrypted message 002" \ | notmuch_drop_mail_headers In-Reply-To References) expected='From: Notmuch Test Suite Subject: Re: test encrypted message 002 +To: test_suite@notmuchmail.org On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite wrote: > This is another test encrypted message.' @@ -401,10 +399,10 @@ test_emacs "(let ((message-hidden-headers '()) (notmuch-show \"subject:test.encrypted.message.002\") (notmuch-show-reply) (test-output))" -# the empty To: is probably a bug, but it's not to do with encryption -grep -v -e '^In-Reply-To:' -e '^References:' -e '^Fcc:' -e 'To:' < OUTPUT > OUTPUT.clean +grep -v -e '^In-Reply-To:' -e '^References:' -e '^Fcc:' < OUTPUT > OUTPUT.clean cat <EXPECTED From: Notmuch Test Suite +To: test_suite@notmuchmail.org Subject: Re: test encrypted message 002 --text follows this line-- <#secure method=pgpmime mode=signencrypt>