* [PATCH] test/crypto: disable gpg version printing
@ 2013-11-27 15:35 David Bremner
2013-11-28 7:36 ` Tomi Ollila
2013-11-29 11:59 ` David Bremner
0 siblings, 2 replies; 3+ messages in thread
From: David Bremner @ 2013-11-27 15:35 UTC (permalink / raw)
To: notmuch
This was causing test failures because version strings varied in
length between GNU/Linux and GNU/KFreeBSD. One can also imagine
different versions of gnupg causing the same failure.
---
Thanks to dkg for the hints to find this bug.
test/crypto | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/test/crypto b/test/crypto
index aa96ec2..9e5ff4f 100755
--- a/test/crypto
+++ b/test/crypto
@@ -19,6 +19,7 @@ add_gnupg_home ()
elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then
echo debug-quick-random >> "$GNUPGHOME"/gpg.conf
fi
+ echo no-emit-version >> "$GNUPGHOME"/gpg.conf
}
##################################################
@@ -62,7 +63,7 @@ expected='[[[{"id": "XXXXX",
"content": "This is a test signed message.\n"},
{"id": 3,
"content-type": "application/pgp-signature",
- "content-length": 315}]}]},
+ "content-length": 280}]}]},
[]]]]'
test_expect_equal_json \
"$output" \
@@ -97,7 +98,7 @@ expected='[[[{"id": "XXXXX",
"content": "This is a test signed message.\n"},
{"id": 3,
"content-type": "application/pgp-signature",
- "content-length": 315}]}]},
+ "content-length": 280}]}]},
[]]]]'
test_expect_equal_json \
"$output" \
@@ -130,7 +131,7 @@ expected='[[[{"id": "XXXXX",
"content": "This is a test signed message.\n"},
{"id": 3,
"content-type": "application/pgp-signature",
- "content-length": 315}]}]},
+ "content-length": 280}]}]},
[]]]]'
test_expect_equal_json \
"$output" \
@@ -354,7 +355,7 @@ expected='[[[{"id": "XXXXX",
"content": "This is a test signed message.\n"},
{"id": 3,
"content-type": "application/pgp-signature",
- "content-length": 315}]}]},
+ "content-length": 280}]}]},
[]]]]'
test_expect_equal_json \
"$output" \
--
1.8.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] test/crypto: disable gpg version printing
2013-11-27 15:35 [PATCH] test/crypto: disable gpg version printing David Bremner
@ 2013-11-28 7:36 ` Tomi Ollila
2013-11-29 11:59 ` David Bremner
1 sibling, 0 replies; 3+ messages in thread
From: Tomi Ollila @ 2013-11-28 7:36 UTC (permalink / raw)
To: David Bremner, notmuch
On Wed, Nov 27 2013, David Bremner <david@tethera.net> wrote:
> This was causing test failures because version strings varied in
> length between GNU/Linux and GNU/KFreeBSD. One can also imagine
> different versions of gnupg causing the same failure.
> ---
> Thanks to dkg for the hints to find this bug.
Wörks. +1
Tomi
>
> test/crypto | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/test/crypto b/test/crypto
> index aa96ec2..9e5ff4f 100755
> --- a/test/crypto
> +++ b/test/crypto
> @@ -19,6 +19,7 @@ add_gnupg_home ()
> elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then
> echo debug-quick-random >> "$GNUPGHOME"/gpg.conf
> fi
> + echo no-emit-version >> "$GNUPGHOME"/gpg.conf
> }
>
> ##################################################
> @@ -62,7 +63,7 @@ expected='[[[{"id": "XXXXX",
> "content": "This is a test signed message.\n"},
> {"id": 3,
> "content-type": "application/pgp-signature",
> - "content-length": 315}]}]},
> + "content-length": 280}]}]},
> []]]]'
> test_expect_equal_json \
> "$output" \
> @@ -97,7 +98,7 @@ expected='[[[{"id": "XXXXX",
> "content": "This is a test signed message.\n"},
> {"id": 3,
> "content-type": "application/pgp-signature",
> - "content-length": 315}]}]},
> + "content-length": 280}]}]},
> []]]]'
> test_expect_equal_json \
> "$output" \
> @@ -130,7 +131,7 @@ expected='[[[{"id": "XXXXX",
> "content": "This is a test signed message.\n"},
> {"id": 3,
> "content-type": "application/pgp-signature",
> - "content-length": 315}]}]},
> + "content-length": 280}]}]},
> []]]]'
> test_expect_equal_json \
> "$output" \
> @@ -354,7 +355,7 @@ expected='[[[{"id": "XXXXX",
> "content": "This is a test signed message.\n"},
> {"id": 3,
> "content-type": "application/pgp-signature",
> - "content-length": 315}]}]},
> + "content-length": 280}]}]},
> []]]]'
> test_expect_equal_json \
> "$output" \
> --
> 1.8.4.3
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] test/crypto: disable gpg version printing
2013-11-27 15:35 [PATCH] test/crypto: disable gpg version printing David Bremner
2013-11-28 7:36 ` Tomi Ollila
@ 2013-11-29 11:59 ` David Bremner
1 sibling, 0 replies; 3+ messages in thread
From: David Bremner @ 2013-11-29 11:59 UTC (permalink / raw)
To: notmuch
David Bremner <david@tethera.net> writes:
> This was causing test failures because version strings varied in
> length between GNU/Linux and GNU/KFreeBSD. One can also imagine
> different versions of gnupg causing the same failure.
> ---
> Thanks to dkg for the hints to find this bug.
pushed.
d
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-29 11:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-27 15:35 [PATCH] test/crypto: disable gpg version printing David Bremner
2013-11-28 7:36 ` Tomi Ollila
2013-11-29 11:59 ` David Bremner
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).