| Message ID | 20170103182801.9638-14-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 03.01.2017 19:27, Daniel P. Berrange wrote: > The 138 and 158 iotests exercise the legacy qcow2 aes encryption > code path. With a few simple tweaks they can exercise the same > feature in qcow (v1). > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > tests/qemu-iotests/134 | 10 +++++----- > tests/qemu-iotests/158 | 2 +- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 > index dd080a2..23b7834 100755 > --- a/tests/qemu-iotests/134 > +++ b/tests/qemu-iotests/134 > @@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.rc > . ./common.filter > > -_supported_fmt qcow2 > +_supported_fmt qcow qcow2 > _supported_proto generic > _supported_os Linux > > @@ -55,19 +55,19 @@ QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT > > echo > echo "== reading whole image ==" > -$QEMU_IO --object $SECRET -c "read 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir > +$QEMU_IO --object $SECRET -c "read 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt > > echo > echo "== rewriting whole image ==" > -$QEMU_IO --object $SECRET -c "write -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir > +$QEMU_IO --object $SECRET -c "write -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt > > echo > echo "== verify pattern ==" > -$QEMU_IO --object $SECRET -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir > +$QEMU_IO --object $SECRET -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt > > echo > echo "== verify pattern failure with wrong password ==" > -$QEMU_IO --object $SECRETALT -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir > +$QEMU_IO --object $SECRETALT -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt What is this necessary for? The qemu-io output does not contain the image format, as far as I can see. Under the premise of "can't hurt", though: Reviewed-by: Max Reitz <mreitz@redhat.com> > > > # success, all done > diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 > index 7a1eb5c..2b53d9f 100755 > --- a/tests/qemu-iotests/158 > +++ b/tests/qemu-iotests/158 > @@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.rc > . ./common.filter > > -_supported_fmt qcow2 > +_supported_fmt qcow qcow2 > _supported_proto generic > _supported_os Linux > >
diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index dd080a2..23b7834 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.rc . ./common.filter -_supported_fmt qcow2 +_supported_fmt qcow qcow2 _supported_proto generic _supported_os Linux @@ -55,19 +55,19 @@ QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT echo echo "== reading whole image ==" -$QEMU_IO --object $SECRET -c "read 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir +$QEMU_IO --object $SECRET -c "read 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt echo echo "== rewriting whole image ==" -$QEMU_IO --object $SECRET -c "write -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir +$QEMU_IO --object $SECRET -c "write -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt echo echo "== verify pattern ==" -$QEMU_IO --object $SECRET -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir +$QEMU_IO --object $SECRET -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt echo echo "== verify pattern failure with wrong password ==" -$QEMU_IO --object $SECRETALT -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir +$QEMU_IO --object $SECRETALT -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt # success, all done diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index 7a1eb5c..2b53d9f 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.rc . ./common.filter -_supported_fmt qcow2 +_supported_fmt qcow qcow2 _supported_proto generic _supported_os Linux
The 138 and 158 iotests exercise the legacy qcow2 aes encryption code path. With a few simple tweaks they can exercise the same feature in qcow (v1). Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- tests/qemu-iotests/134 | 10 +++++----- tests/qemu-iotests/158 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)