On 06/09/2017 06:50 AM, Kevin Wolf wrote: > After _cleanup_qemu(), test cases should be able to start the next qemu > process and call _cleanup_qemu() for that one as well. For this to work > cleanly, we need to improve the cleanup so that the second invocation > doesn't try to kill the qemu instances from the first invocation a > second time (which would result in error messages).
Yeah, idempotency is a nice thing.
>
> Signed-off-by: Kevin Wolf <kw...@redhat.com>
> ---
> tests/qemu-iotests/common.qemu | 3 +++
> 1 file changed, 3 insertions(+)
>
Reviewed-by: Eric Blake <ebl...@redhat.com>
> diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu
> index 7a78a00..76ef298 100644
> --- a/tests/qemu-iotests/common.qemu
> +++ b/tests/qemu-iotests/common.qemu
> @@ -222,5 +222,8 @@ function _cleanup_qemu()
> rm -f "${QEMU_FIFO_IN}_${i}" "${QEMU_FIFO_OUT}_${i}"
> eval "exec ${QEMU_IN[$i]}<&-" # close file descriptors
> eval "exec ${QEMU_OUT[$i]}<&-"
> +
> + unset QEMU_IN[$i]
> + unset QEMU_OUT[$i]
> done
> }
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
