From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 8 May 2019 12:00:44 +0000 (+0200)
Subject: qemu-iotests: Fix cleanup for 192
X-Git-Tag: v4.1.0-rc0~117^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d231a384c5d72491e6ddc8006d6be929ca6c609;p=thirdparty%2Fqemu.git

qemu-iotests: Fix cleanup for 192

Test case 192 calls _launch_qemu, so it also needs to _cleanup_qemu when
it's done, otherwise the QMP FIFOs stay around in scratch/. It also
creates a temporary NBD socket that needs to be removed as well at the
end of the test case.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
---

diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index 158086f9d2c..61a88ac88d4 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192
@@ -29,7 +29,9 @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
+    _cleanup_qemu
+    _cleanup_test_img
+    rm -f "$TEST_DIR/nbd"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15