[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 02/15] iotests: Fix test 156
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 02/15] iotests: Fix test 156 |
Date: |
Tue, 1 Aug 2017 16:46:19 +0200 |
From: Max Reitz <address@hidden>
On one hand, the _make_test_img invocation for creating the target image
was missing a -u because its backing file is not supposed to exist at
that point.
On the other hand, nobody noticed probably because the backing file is
created later on and _cleanup failed to remove it: The quotation marks
were misplaced so bash tried to delete a file literally called
"$TEST_IMG{,.target}..." instead of performing brace expansion. Thus, the
files stayed around after the first run and qemu-img create did not
complain about a missing backing file on any run but the first.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/156 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index 2c4a06e2d8..e75dc4d743 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -38,7 +38,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
- rm -f "$TEST_IMG{,.target}{,.backing,.overlay}"
+ rm -f "$TEST_IMG"{,.target}{,.backing,.overlay}
}
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -83,7 +83,7 @@ _send_qemu_cmd $QEMU_HANDLE \
'return'
# Create target image
-TEST_IMG="$TEST_IMG.target.overlay" _make_test_img -b "$TEST_IMG.target" 1M
+TEST_IMG="$TEST_IMG.target.overlay" _make_test_img -u -b "$TEST_IMG.target" 1M
# Mirror snapshot
_send_qemu_cmd $QEMU_HANDLE \
--
2.13.3
- [Qemu-block] [PULL 00/15] Block layer patches for 2.10.0-rc1, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 04/15] iotests: Check dirty bitmap statistics in 124, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 05/15] iotests: Add test of recent fix to 'qemu-img measure', Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 03/15] iotests: Redirect stderr to stdout in 186, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 02/15] iotests: Fix test 156,
Kevin Wolf <=
- [Qemu-block] [PULL 06/15] block: fix dangling bs->explicit_options in block.c, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 08/15] qemu-iotests/041: Fix leaked scratch images, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 01/15] docs: add qemu-block-drivers(7) man page, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 09/15] qemu-iotests: Remove blkdebug.conf after tests, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 07/15] block: fix leaks in bdrv_open_driver(), Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 10/15] qemu-iotests/141: Fix image cleanup, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 13/15] qemu-iotests/063: Fix leaked image, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 11/15] qemu-iotests/153: Fix leaked scratch images, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 14/15] qemu-iotests/059: Fix leaked image files, Kevin Wolf, 2017/08/01
- [Qemu-block] [PULL 15/15] block/qapi: Remove redundant NULL check to silence Coverity, Kevin Wolf, 2017/08/01