diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2019-05-02 09:19:39 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2019-05-03 06:55:52 -0300 |
| commit | 7e6f55b268d38a904b67bf0ce67f97e07661094f (patch) | |
| tree | 0a3d26c88419fa39c010874927a8e3729fbf5a26 | |
| parent | 652baa6fe6a93e401463e17a4ce6577efd3f7fea (diff) | |
gmime-cleanup: simplify T355-smime.sh
GMime 3.0 and later can handle User ID as expected.
signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
| -rwxr-xr-x | test/T355-smime.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/test/T355-smime.sh b/test/T355-smime.sh index be45e3b1..e410286b 100755 --- a/test/T355-smime.sh +++ b/test/T355-smime.sh @@ -48,12 +48,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT 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" \ | notmuch_json_show_sanitize \ | sed -e 's|"created": [-1234567890]*|"created": 946728000|' \ @@ -71,7 +65,8 @@ expected='[[[{"id": "XXXXX", "Date": "Sat, 01 Jan 2000 12:00:00 +0000"}, "body": [{"id": 1, "sigstatus": [{"fingerprint": "'$FINGERPRINT'", - "status": "good",'$USERID' + "status": "good", + "userid": "CN=Notmuch Test Suite", "expires": 424242424, "created": 946728000}], "content-type": "multipart/signed", |