| Message ID | 20240730094701.790624-1-andrey.drobyshev@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | iotests/024: exclude 'backing file format' field from the output | expand |
On Tue, Jul 30, 2024 at 12:47:01PM GMT, Andrey Drobyshev wrote: > Apparently 'qemu-img info' doesn't report the backing file format field > for qed (as it does for qcow2): > > $ qemu-img create -f qed base.qed 1M && qemu-img create -f qed -b base.qed -F qed top.qed 1M > $ qemu-img create -f qcow2 base.qcow2 1M && qemu-img create -f qcow2 -b base.qcow2 -F qcow2 top.qcow2 1M > $ qemu-img info top.qed | grep 'backing file format' > $ qemu-img info top.qcow2 | grep 'backing file format' > backing file format: qcow2 > > This leads to the 024 test failure with -qed. Let's just filter the > field out and exclude it from the output. > > This is a fixup for the commit f93e65ee51 ("iotests/{024, 271}: add > testcases for qemu-img rebase"). > > Found-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> > --- > tests/qemu-iotests/024 | 2 +- > tests/qemu-iotests/024.out | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
On 30/7/24 11:47, Andrey Drobyshev wrote: > Apparently 'qemu-img info' doesn't report the backing file format field > for qed (as it does for qcow2): > > $ qemu-img create -f qed base.qed 1M && qemu-img create -f qed -b base.qed -F qed top.qed 1M > $ qemu-img create -f qcow2 base.qcow2 1M && qemu-img create -f qcow2 -b base.qcow2 -F qcow2 top.qcow2 1M > $ qemu-img info top.qed | grep 'backing file format' > $ qemu-img info top.qcow2 | grep 'backing file format' > backing file format: qcow2 > > This leads to the 024 test failure with -qed. Let's just filter the > field out and exclude it from the output. > > This is a fixup for the commit f93e65ee51 ("iotests/{024, 271}: add > testcases for qemu-img rebase"). > > Found-by: Thomas Huth <thuth@redhat.com> s/Found/Reported/ > Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> > --- > tests/qemu-iotests/024 | 2 +- > tests/qemu-iotests/024.out | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-)
Am 30.07.2024 um 11:47 hat Andrey Drobyshev geschrieben: > Apparently 'qemu-img info' doesn't report the backing file format field > for qed (as it does for qcow2): > > $ qemu-img create -f qed base.qed 1M && qemu-img create -f qed -b base.qed -F qed top.qed 1M > $ qemu-img create -f qcow2 base.qcow2 1M && qemu-img create -f qcow2 -b base.qcow2 -F qcow2 top.qcow2 1M > $ qemu-img info top.qed | grep 'backing file format' > $ qemu-img info top.qcow2 | grep 'backing file format' > backing file format: qcow2 > > This leads to the 024 test failure with -qed. Let's just filter the > field out and exclude it from the output. > > This is a fixup for the commit f93e65ee51 ("iotests/{024, 271}: add > testcases for qemu-img rebase"). > > Found-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> Thanks, applied to the block branch. Kevin
diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 index 285f17e79f..b29c76e161 100755 --- a/tests/qemu-iotests/024 +++ b/tests/qemu-iotests/024 @@ -283,7 +283,7 @@ TEST_IMG=$BASE_OLD _make_test_img -b "$BASE_NEW" -F $IMGFMT \ CLUSTER_SIZE=$(( CLUSTER_SIZE * 2 )) TEST_IMG=$OVERLAY \ _make_test_img -b "$BASE_OLD" -F $IMGFMT $(( CLUSTER_SIZE * 6 )) -TEST_IMG=$OVERLAY _img_info +TEST_IMG=$OVERLAY _img_info | grep -v '^backing file format:' echo echo "Fill backing files with data" diff --git a/tests/qemu-iotests/024.out b/tests/qemu-iotests/024.out index e1e8eea863..3d1e31927a 100644 --- a/tests/qemu-iotests/024.out +++ b/tests/qemu-iotests/024.out @@ -214,7 +214,6 @@ file format: IMGFMT virtual size: 384 KiB (393216 bytes) cluster_size: 131072 backing file: TEST_DIR/subdir/t.IMGFMT.base_old -backing file format: IMGFMT Fill backing files with data
Apparently 'qemu-img info' doesn't report the backing file format field for qed (as it does for qcow2): $ qemu-img create -f qed base.qed 1M && qemu-img create -f qed -b base.qed -F qed top.qed 1M $ qemu-img create -f qcow2 base.qcow2 1M && qemu-img create -f qcow2 -b base.qcow2 -F qcow2 top.qcow2 1M $ qemu-img info top.qed | grep 'backing file format' $ qemu-img info top.qcow2 | grep 'backing file format' backing file format: qcow2 This leads to the 024 test failure with -qed. Let's just filter the field out and exclude it from the output. This is a fixup for the commit f93e65ee51 ("iotests/{024, 271}: add testcases for qemu-img rebase"). Found-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> --- tests/qemu-iotests/024 | 2 +- tests/qemu-iotests/024.out | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)