From: Max Reitz <mreitz@redhat.com>
Date: Tue, 27 Oct 2020 19:05:52 +0000 (+0100)
Subject: iotests/091: Use _cleanup_qemu instad of "wait"
X-Git-Tag: v6.0.0-rc0~185^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4a373bc1c7c491a75d07b962841e092bbc77f64;p=thirdparty%2Fqemu.git

iotests/091: Use _cleanup_qemu instad of "wait"

If the test environment has some other child processes running (like a
storage daemon that provides a FUSE export), then "wait" will never
finish.  Use wait=yes _cleanup_qemu instead.

(We need to discard the output so there is no change to the reference
output.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201027190600.192171-13-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index 68fbfd777b3..8a4ce5b7e27 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -96,7 +96,8 @@ _send_qemu_cmd $h2 'qemu-io disk flush' "(qemu)"
 _send_qemu_cmd $h2 'quit' ""
 _send_qemu_cmd $h1 'quit' ""
 
-wait
+wait=yes _cleanup_qemu >/dev/null
+
 echo "Check image pattern"
 ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filter_qemu_io