From df2b487c5db2af183a75bc32e3a3adf9b90c6316 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sun, 20 Mar 2022 17:07:13 -0400 Subject: [PATCH] test: avoid breakage with the latest gmime since gmime 3.2.7, it is now reporting the more stable "email" field from gpgme as the cert info: https://github.com/jstedfast/gmime/commit/0ab298a0086c09c403b5d35effa73b59f271693d However, this changes the minimum version of gmime quite dramatically. A better fix would add a gmime test that normalizes the test results appropriately, contingent on whether this change is made in gmime, but i haven't written that test yet. --- configure | 2 +- test/T355-smime.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 36f3f606..d529c358 100755 --- a/configure +++ b/configure @@ -481,7 +481,7 @@ if [ ${have_xapian} = "0" ]; then errors=$((errors + 1)) fi -GMIME_MINVER=3.0.3 +GMIME_MINVER=3.2.8 printf "Checking for GMime development files (>= $GMIME_MINVER)... " if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then diff --git a/test/T355-smime.sh b/test/T355-smime.sh index 31fa4b4e..c25f94f9 100755 --- a/test/T355-smime.sh +++ b/test/T355-smime.sh @@ -46,7 +46,7 @@ expected='[[[{"id": "XXXXX", "timestamp": 946728000, "date_relative": "2000-01-01", "tags": ["inbox","signed"], - "crypto": {"signed": {"status": [{"fingerprint": "'$FINGERPRINT'", "status": "good","userid": "CN=Notmuch Test Suite", "email": "", "expires": 424242424, "created": 946728000}]}}, + "crypto": {"signed": {"status": [{"fingerprint": "'$FINGERPRINT'", "status": "good","userid": "CN=Notmuch Test Suite", "email": "test_suite@notmuchmail.org", "expires": 424242424, "created": 946728000}]}}, "headers": {"Subject": "test signed message 001", "From": "Notmuch Test Suite ", "To": "test_suite@notmuchmail.org", @@ -55,7 +55,7 @@ expected='[[[{"id": "XXXXX", "sigstatus": [{"fingerprint": "'$FINGERPRINT'", "status": "good", "userid": "CN=Notmuch Test Suite", - "email": "", + "email": "test_suite@notmuchmail.org", "expires": 424242424, "created": 946728000}], "content-type": "multipart/signed", -- 2.35.1