debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gmime-cleanup: simplify T355-smime.sh

Browse source 
GMime 3.0 and later can handle User ID as expected.

signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor 2019-05-02 09:19:39 -04:00 committed by David Bremner
parent 652baa6fe6
commit 7e6f55b268
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/T355-smime.sh
View file

@ -48,12 +48,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "signature verification (notmuch CLI)" test_begin_subtest "signature verification (notmuch CLI)"
if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then
# gmime 2 can't report User IDs properly for S/MIME
USERID=''
else
USERID='"userid": "CN=Notmuch Test Suite",'
fi
output=$(notmuch show --format=json --verify subject:"test signed message 001" \ output=$(notmuch show --format=json --verify subject:"test signed message 001" \
| notmuch_json_show_sanitize \ | notmuch_json_show_sanitize \
| sed -e 's|"created": [-1234567890]*|"created": 946728000|' \ | sed -e 's|"created": [-1234567890]*|"created": 946728000|' \
@ -71,7 +65,8 @@ expected='[[[{"id": "XXXXX",
"Date": "Sat, 01 Jan 2000 12:00:00 +0000"}, "Date": "Sat, 01 Jan 2000 12:00:00 +0000"},
"body": [{"id": 1, "body": [{"id": 1,
"sigstatus": [{"fingerprint": "'$FINGERPRINT'", "sigstatus": [{"fingerprint": "'$FINGERPRINT'",
"status": "good",'$USERID' "status": "good",
"userid": "CN=Notmuch Test Suite",
"expires": 424242424, "expires": 424242424,
"created": 946728000}], "created": 946728000}],
"content-type": "multipart/signed", "content-type": "multipart/signed",