[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/2] iotests: Fix test 156
From: |
Jeff Cody |
Subject: |
Re: [Qemu-devel] [PATCH 1/2] iotests: Fix test 156 |
Date: |
Wed, 26 Jul 2017 18:19:28 -0400 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Tue, Jul 25, 2017 at 05:56:43PM +0200, Max Reitz wrote:
> 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 deleted a file literally called
> "$TEST_IMG{,.target}..." instead of resolving the globs. 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>
> ---
> 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 2c4a06e..e75dc4d 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.9.4
>
>
Reviewed-by: Jeff Cody <address@hidden>