[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/13] iotests: Only kill NBD server if it runs
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 08/13] iotests: Only kill NBD server if it runs |
Date: |
Thu, 27 Nov 2014 15:48:35 +0100 |
There may be NBD tests which do not create a sample image and simply
test whether wrong usage of the protocol is rejected as expected. In
this case, there will be no NBD server and trying to kill it during
clean-up will fail.
Cc: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/common.rc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 9c49deb..f2554ec 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -175,7 +175,9 @@ _cleanup_test_img()
case "$IMGPROTO" in
nbd)
- kill $QEMU_NBD_PID
+ if [ -n "$QEMU_NBD_PID" ]; then
+ kill $QEMU_NBD_PID
+ fi
rm -f "$TEST_IMG_FILE"
;;
file)
--
1.9.3
- [Qemu-devel] [PATCH v2 00/13] block: Various Coverity-spotted fixes, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 01/13] block: Make essential BlockDriver objects public, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 02/13] block: Omit bdrv_find_format for essential drivers, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 03/13] block/vvfat: qcow driver may not be found, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 04/13] block/nfs: Add create_opts, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 05/13] block: Check create_opts before image creation, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 06/13] qemu-img: Check create_opts before image creation, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 07/13] qemu-img: Check create_opts before image amendment, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 08/13] iotests: Only kill NBD server if it runs,
Max Reitz <=
- [Qemu-devel] [PATCH v2 09/13] iotests: Add test for unsupported image creation, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 10/13] qcow2: Prevent numerical overflow, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 12/13] qcow2: Respect bdrv_truncate() error, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 11/13] qcow2: Flushing the caches in qcow2_close may fail, Max Reitz, 2014/11/27
- [Qemu-devel] [PATCH v2 13/13] block/raw-posix: Fix ret in raw_open_common(), Max Reitz, 2014/11/27