Re: [PATCH 07/23] test/crypto: mark extra space in userid as a bug in gmime-2.6

[Tomi Ollila <tomi.ollila@iki.fi>]

On Sat, Jun 03 2017, David Bremner wrote:

> I can't see the space in the output of gpg -K --with-colons
> ---
>  test/T350-crypto.sh | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh
> index 0753acf3..720a2225 100755
> --- a/test/T350-crypto.sh
> +++ b/test/T350-crypto.sh
> @@ -69,6 +69,7 @@ test_expect_equal_json \
>      "$expected"
>  
>  test_begin_subtest "signature verification with full owner trust"
> +test_subtest_broken_gmime_2
>  # give the key full owner trust
>  echo "${FINGERPRINT}:6:" | gpg --no-tty --import-ownertrust >>"$GNUPGHOME"/trust.log 2>&1
>  gpg --no-tty --check-trustdb >>"$GNUPGHOME"/trust.log 2>&1
> @@ -90,7 +91,7 @@ expected='[[[{"id": "XXXXX",
>   "sigstatus": [{"status": "good",
>   "fingerprint": "'$FINGERPRINT'",
>   "created": 946728000,
> - "userid": " Notmuch Test Suite <test_suite@notmuchmail.org> (INSECURE!)"}],
> + "userid": "Notmuch Test Suite <test_suite@notmuchmail.org> (INSECURE!)"}],


You could add a variable which is set to ' ' when gmime_2 is used and ''
when gmime_3 is used and insert that just like '"$FINGERPRINT"' is added
-- that change would not need to live there forever -- just couple of
years until we drop support for gmime_2... ( ;) )

e.e. "userid: "'"$GM2SPC"'Notmuch Test Suite..."

(if nimed as such, T350-crypto.sh -local variable)

Tomi

>   "content-type": "multipart/signed",
>   "content": [{"id": 2,
>   "content-type": "text/plain",
> @@ -276,6 +277,7 @@ test_expect_success \
>      "(mml-secure-message-sign-encrypt)"'
>  
>  test_begin_subtest "decryption + signature verification"
> +test_subtest_broken_gmime_2
>  output=$(notmuch show --format=json --decrypt subject:"test encrypted message 002" \
>      | notmuch_json_show_sanitize \
>      | sed -e 's|"created": [1234567890]*|"created": 946728000|')
> @@ -295,7 +297,7 @@ expected='[[[{"id": "XXXXX",
>   "sigstatus": [{"status": "good",
>   "fingerprint": "'$FINGERPRINT'",
>   "created": 946728000,
> - "userid": " Notmuch Test Suite <test_suite@notmuchmail.org> (INSECURE!)"}],
> + "userid": "Notmuch Test Suite <test_suite@notmuchmail.org> (INSECURE!)"}],
>   "content-type": "multipart/encrypted",
>   "content": [{"id": 2,
>   "content-type": "application/pgp-encrypted",
> -- 
> 2.11.0
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch