[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH 2/2] iotests: avoid broken pipe with certtool
From: |
Thomas Huth |
Subject: |
Re: [Qemu-block] [PATCH 2/2] iotests: avoid broken pipe with certtool |
Date: |
Tue, 19 Feb 2019 17:19:46 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 |
On 19/02/2019 17.13, Daniel P. Berrangé wrote:
> When we run "certtool | head -1" the latter command is likely to
> complete and exit before certtool has written everything it wants to
> stderr. In at least the RHEL-7 gnutls 3.3.29 this causes certtool to
> quit with broken pipe before it has finished writing the desired
> output file to disk. This causes non-deterministic failures of the
> iotest 233 because the certs are sometimes zero length files.
> If certtool fails the "head -1" means we also loose any useful error
> message it would have printed.
>
> Thus this patch gets rid of the pipe and post-processes the output in a
> more flexible & reliable manner.
>
> Reported-by: Thomas Huth <address@hidden>
> Signed-off-by: Daniel P. Berrangé <address@hidden>
> ---
> tests/qemu-iotests/common.tls | 48 +++++++++++++++++++++++------------
> 1 file changed, 32 insertions(+), 16 deletions(-)
>
> diff --git a/tests/qemu-iotests/common.tls b/tests/qemu-iotests/common.tls
> index eae81789bb..6cf11ed383 100644
> --- a/tests/qemu-iotests/common.tls
> +++ b/tests/qemu-iotests/common.tls
> @@ -29,6 +29,17 @@ tls_x509_cleanup()
> }
>
>
> +tls_certtool()
> +{
> + certtool "$@" 1>certtool.log 2>&1
> + if test "$?" = 0; then
> + head -1 certtool.log
> + else
> + cat certtool.log
> + fi
> + rm -f certtool.log
> +}
I assume this is running in a unique directory so that there can not be
a clash with a test running in parallel? Otherwise I'd recommend an
mktemp file name here...
Anyway, this fixes the issue for me, too, thus:
Tested-by: Thomas Huth <address@hidden>