| Message ID | 1350045069-8500-3-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
Il 12/10/2012 14:31, Kevin Wolf ha scritto: > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > tests/qemu-iotests/041 | 78 ++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/041.out | 15 ++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 94 insertions(+), 0 deletions(-) > create mode 100755 tests/qemu-iotests/041 > create mode 100644 tests/qemu-iotests/041.out > > diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 > new file mode 100755 > index 0000000..c3c3ca8 > --- /dev/null > +++ b/tests/qemu-iotests/041 > @@ -0,0 +1,78 @@ > +#!/bin/bash > +# > +# Test qemu-img operation on zero size images > +# > +# Copyright (C) 2012 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 > +owner=kwolf@redhat.com > + > +seq=`basename $0` > +echo "QA output created by $seq" > + > +here=`pwd` > +tmp=/tmp/$$ > +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 > + > +_supported_fmt qcow2 qcow qed vmdk > +_supported_proto file > +_supported_os Linux > + > +echo > +echo "== Creating zero size image ==" > + > +_make_test_img 0 > +_check_test_img > + > +mv $TEST_IMG $TEST_IMG.orig > + > +echo > +echo "== Converting the image ==" > + > +$QEMU_IMG convert -O $IMGFMT $TEST_IMG.orig $TEST_IMG > +_check_test_img > + > +echo > +echo "== Converting the image, compressed ==" > + > +if [ "$IMGFMT" == "qcow2" ]; then > + $QEMU_IMG convert -c -O $IMGFMT $TEST_IMG.orig $TEST_IMG > +fi > +_check_test_img > + > +echo > +echo "== Rebasing the image ==" > + > +$QEMU_IMG rebase -u -b $TEST_IMG.orig $TEST_IMG > +$QEMU_IMG rebase -b $TEST_IMG.orig $TEST_IMG > +_check_test_img > + > +# success, all done > +echo "*** done" > +rm -f $seq.full > +status=0 > + > diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out > new file mode 100644 > index 0000000..98514fa > --- /dev/null > +++ b/tests/qemu-iotests/041.out > @@ -0,0 +1,15 @@ > +QA output created by 041 > + > +== Creating zero size image == > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=0 > +No errors were found on the image. > + > +== Converting the image == > +No errors were found on the image. > + > +== Converting the image, compressed == > +No errors were found on the image. > + > +== Rebasing the image == > +No errors were found on the image. > +*** done > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > index 66d2ba9..fa4a7da 100644 > --- a/tests/qemu-iotests/group > +++ b/tests/qemu-iotests/group > @@ -47,3 +47,4 @@ > 038 rw auto backing > 039 rw auto > 040 rw auto > +041 rw auto quick > FWIW, this will require renaming the mirror test to 042 :( Since I have multiple patches touching the file while you have just one, any chance you can hold up this series for a week or so? Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Paolo
Am 12.10.2012 18:57, schrieb Paolo Bonzini: > FWIW, this will require renaming the mirror test to 042 :( Since I have > multiple patches touching the file while you have just one, any chance > you can hold up this series for a week or so? So is 042 still free? Then I'd just change this patch to use 042. There's no strict rule that 041 must be committed earlier than 042. Kevin
> Am 12.10.2012 18:57, schrieb Paolo Bonzini: > > FWIW, this will require renaming the mirror test to 042 :( Since I > > have > > multiple patches touching the file while you have just one, any > > chance > > you can hold up this series for a week or so? > > So is 042 still free? Then I'd just change this patch to use 042. > There's no strict rule that 041 must be committed earlier than 042. Yes, that would work too--thanks! Paolo
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 new file mode 100755 index 0000000..c3c3ca8 --- /dev/null +++ b/tests/qemu-iotests/041 @@ -0,0 +1,78 @@ +#!/bin/bash +# +# Test qemu-img operation on zero size images +# +# Copyright (C) 2012 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 +owner=kwolf@redhat.com + +seq=`basename $0` +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +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 + +_supported_fmt qcow2 qcow qed vmdk +_supported_proto file +_supported_os Linux + +echo +echo "== Creating zero size image ==" + +_make_test_img 0 +_check_test_img + +mv $TEST_IMG $TEST_IMG.orig + +echo +echo "== Converting the image ==" + +$QEMU_IMG convert -O $IMGFMT $TEST_IMG.orig $TEST_IMG +_check_test_img + +echo +echo "== Converting the image, compressed ==" + +if [ "$IMGFMT" == "qcow2" ]; then + $QEMU_IMG convert -c -O $IMGFMT $TEST_IMG.orig $TEST_IMG +fi +_check_test_img + +echo +echo "== Rebasing the image ==" + +$QEMU_IMG rebase -u -b $TEST_IMG.orig $TEST_IMG +$QEMU_IMG rebase -b $TEST_IMG.orig $TEST_IMG +_check_test_img + +# success, all done +echo "*** done" +rm -f $seq.full +status=0 + diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out new file mode 100644 index 0000000..98514fa --- /dev/null +++ b/tests/qemu-iotests/041.out @@ -0,0 +1,15 @@ +QA output created by 041 + +== Creating zero size image == +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=0 +No errors were found on the image. + +== Converting the image == +No errors were found on the image. + +== Converting the image, compressed == +No errors were found on the image. + +== Rebasing the image == +No errors were found on the image. +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 66d2ba9..fa4a7da 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -47,3 +47,4 @@ 038 rw auto backing 039 rw auto 040 rw auto +041 rw auto quick
Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- tests/qemu-iotests/041 | 78 ++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/041.out | 15 ++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 94 insertions(+), 0 deletions(-) create mode 100755 tests/qemu-iotests/041 create mode 100644 tests/qemu-iotests/041.out