Re: [Qemu-devel] [RFC v2 8/8] iotests: add test 178 for qemu-img measure

[Stefan Hajnoczi]

On Sat, Mar 18, 2017 at 09:04:59PM +0000, Nir Soffer wrote:
> On Wed, Mar 15, 2017 at 11:30 AM Stefan Hajnoczi <address@hidden>
> wrote:
> 
> > Signed-off-by: Stefan Hajnoczi <address@hidden>
> > ---
> >  tests/qemu-iotests/178           | 75
> > ++++++++++++++++++++++++++++++++++++++++
> >  tests/qemu-iotests/178.out.qcow2 | 33 ++++++++++++++++++
> >  tests/qemu-iotests/178.out.raw   | 33 ++++++++++++++++++
> >  tests/qemu-iotests/group         |  1 +
> >  4 files changed, 142 insertions(+)
> >  create mode 100755 tests/qemu-iotests/178
> >  create mode 100644 tests/qemu-iotests/178.out.qcow2
> >  create mode 100644 tests/qemu-iotests/178.out.raw
> >
> > diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
> > new file mode 100755
> > index 0000000..8db1241
> > --- /dev/null
> > +++ b/tests/qemu-iotests/178
> > @@ -0,0 +1,75 @@
> > +#!/bin/bash
> > +#
> > +# qemu-img measure sub-command tests
> > +#
> > +# Copyright (C) 2017 Red Hat, Inc.
> > +#
> > +# This program is free software; you can redistribute it and/or modify
> > +# it under the terms of the GNU General Public License as published by
> > +# the Free Software Foundation; either version 2 of the License, or
> > +# (at your option) any later version.
> > +#
> > +# This program is distributed in the hope that it will be useful,
> > +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > +# GNU General Public License for more details.
> > +#
> > +# You should have received a copy of the GNU General Public License
> > +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
> > +#
> > +
> > +# creator
> > address@hidden
> > +
> > +seq=`basename $0`
> > +echo "QA output created by $seq"
> > +
> > +here=`pwd`
> > +status=1    # failure is the default!
> > +
> > +_cleanup()
> > +{
> > +    _cleanup_test_img
> > +}
> > +trap "_cleanup; exit \$status" 0 1 2 3 15
> > +
> > +# get standard environment, filters and checks
> > +. ./common.rc
> > +. ./common.filter
> > +. ./common.pattern
> > +
> > +_supported_fmt raw qcow2
> > +_supported_proto file
> > +_supported_os Linux
> > +
> > +echo "Input validation"
> >
> 
> Maybe:
> 
> echo "== Input validation =="
> 
> for nicer output?

Will fix.  Other test cases also use "== Title ==" so it should be
changed for consistency.

> > +echo
> > +
> > +_make_test_img 1G
> > +
> > +$QEMU_IMG measure # missing arguments
> > +$QEMU_IMG measure --size 2G "$TEST_IMG" # only one allowed
> > +$QEMU_IMG measure "$TEST_IMG" a # only one filename allowed
> > +$QEMU_IMG measure --object secret,id=sec0,data=MTIzNDU2,format=base64 #
> > missing filename
> > +$QEMU_IMG measure --image-opts # missing filename
> > +$QEMU_IMG measure -f qcow2 # missing filename
> > +$QEMU_IMG measure -l snap1 # missing filename
> > +$QEMU_IMG measure -o , # invalid option list
> > +$QEMU_IMG measure -l snapshot.foo # invalid snapshot option
> > +$QEMU_IMG measure --output foo # invalid output format
> > +$QEMU_IMG measure --size -1 # invalid image size
> > +$QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file format
> > +
> > +echo
> > +echo "Size calculation"
> > +echo
> > +
> > +for ofmt in human json; do
> > +    $QEMU_IMG measure --output=$ofmt -O "$IMGFMT" --size 2G
> >
> 
> --size 0 may be interesting test

Will fix.

> > +    $QEMU_IMG measure --output=$ofmt -f "$IMGFMT" -O "$IMGFMT" "$TEST_IMG"
> >
> 
> This measure converting raw to raw or qcow2 to qcow2, not sure it is very
> interesting, since in raw we don't need to measure, the size is always
> the virtual size, and for converting qcow2 to qcow2 can use use the
> source size.
> 
> The most interesting case is converting raw to qcow2, and we want to test:
> - empty file
> - file with some clusters allocated
> - file with all clusters allocated

I'll extend the test to include both raw -> $IMGFMT and $IMGFMT ->
$IMGFMT.

signature.asc
Description: PGP signature