| Message ID | 20191219144243.1763246-1-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iotests/279: Fix for non-qcow2 formats | expand |
On 12/19/19 9:42 AM, Max Reitz wrote: > First, driver=qcow2 will not work so well with non-qcow2 formats (and > this test claims to support qcow, qed, and vmdk). > > Second, vmdk will always report the backing file format to be vmdk. > Filter that out so the output looks like for all other formats. > > Third, the flat vmdk subformats do not support backing files, so they > will not work with this test. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/279 | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279 > index 6682376808..30d29b1cb2 100755 > --- a/tests/qemu-iotests/279 > +++ b/tests/qemu-iotests/279 > @@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > _supported_fmt qcow qcow2 vmdk qed > _supported_proto file > _supported_os Linux > +_unsupported_imgopts "subformat=monolithicFlat" \ > + "subformat=twoGbMaxExtentFlat" \ > > TEST_IMG="$TEST_IMG.base" _make_test_img 64M > TEST_IMG="$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base" > @@ -45,11 +47,12 @@ _make_test_img -b "$TEST_IMG.mid" > > echo > echo '== qemu-img info --backing-chain ==' > -_img_info --backing-chain | _filter_img_info > +_img_info --backing-chain | _filter_img_info | grep -v 'backing file format' > > echo > echo '== qemu-img info --backing-chain --image-opts ==' > -TEST_IMG="driver=qcow2,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts | _filter_img_info > +TEST_IMG="driver=$IMGFMT,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts \ > + | _filter_img_info | grep -v 'backing file format' Haha. Reviewed-by: John Snow <jsnow@redhat.com> > > # success, all done > echo "*** done" >
On 19/12/2019 15.42, Max Reitz wrote: > First, driver=qcow2 will not work so well with non-qcow2 formats (and > this test claims to support qcow, qed, and vmdk). > > Second, vmdk will always report the backing file format to be vmdk. > Filter that out so the output looks like for all other formats. > > Third, the flat vmdk subformats do not support backing files, so they > will not work with this test. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/279 | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279 > index 6682376808..30d29b1cb2 100755 > --- a/tests/qemu-iotests/279 > +++ b/tests/qemu-iotests/279 > @@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > _supported_fmt qcow qcow2 vmdk qed > _supported_proto file > _supported_os Linux > +_unsupported_imgopts "subformat=monolithicFlat" \ > + "subformat=twoGbMaxExtentFlat" \ > > TEST_IMG="$TEST_IMG.base" _make_test_img 64M > TEST_IMG="$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base" > @@ -45,11 +47,12 @@ _make_test_img -b "$TEST_IMG.mid" > > echo > echo '== qemu-img info --backing-chain ==' > -_img_info --backing-chain | _filter_img_info > +_img_info --backing-chain | _filter_img_info | grep -v 'backing file format' > > echo > echo '== qemu-img info --backing-chain --image-opts ==' > -TEST_IMG="driver=qcow2,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts | _filter_img_info > +TEST_IMG="driver=$IMGFMT,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts \ > + | _filter_img_info | grep -v 'backing file format' > > # success, all done > echo "*** done" > This fixes the problems with "check -qed 279" and "check -vmdk 279" for me. Tested-by: Thomas Huth <thuth@redhat.com>
On 19.12.19 15:42, Max Reitz wrote: > First, driver=qcow2 will not work so well with non-qcow2 formats (and > this test claims to support qcow, qed, and vmdk). > > Second, vmdk will always report the backing file format to be vmdk. > Filter that out so the output looks like for all other formats. > > Third, the flat vmdk subformats do not support backing files, so they > will not work with this test. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/279 | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Applied to my block branch. Max
diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279 index 6682376808..30d29b1cb2 100755 --- a/tests/qemu-iotests/279 +++ b/tests/qemu-iotests/279 @@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow qcow2 vmdk qed _supported_proto file _supported_os Linux +_unsupported_imgopts "subformat=monolithicFlat" \ + "subformat=twoGbMaxExtentFlat" \ TEST_IMG="$TEST_IMG.base" _make_test_img 64M TEST_IMG="$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base" @@ -45,11 +47,12 @@ _make_test_img -b "$TEST_IMG.mid" echo echo '== qemu-img info --backing-chain ==' -_img_info --backing-chain | _filter_img_info +_img_info --backing-chain | _filter_img_info | grep -v 'backing file format' echo echo '== qemu-img info --backing-chain --image-opts ==' -TEST_IMG="driver=qcow2,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts | _filter_img_info +TEST_IMG="driver=$IMGFMT,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts \ + | _filter_img_info | grep -v 'backing file format' # success, all done echo "*** done"
First, driver=qcow2 will not work so well with non-qcow2 formats (and this test claims to support qcow, qed, and vmdk). Second, vmdk will always report the backing file format to be vmdk. Filter that out so the output looks like for all other formats. Third, the flat vmdk subformats do not support backing files, so they will not work with this test. Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/279 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)