From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59165) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLauv-00053y-RG for qemu-devel@nongnu.org; Thu, 06 Mar 2014 11:13:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLaur-00053H-A9 for qemu-devel@nongnu.org; Thu, 06 Mar 2014 11:13:05 -0500 Received: from lnantes-156-75-100-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:55859 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLauq-00052u-W3 for qemu-devel@nongnu.org; Thu, 06 Mar 2014 11:13:01 -0500 Date: Thu, 6 Mar 2014 17:13:00 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140306161300.GF22291@irqsave.net> References: <1394120669-4675-1-git-send-email-kwolf@redhat.com> <1394120669-4675-4-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1394120669-4675-4-git-send-email-kwolf@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 3/3] qemu-iotests: Test a few blockdev-add error cases List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com The Thursday 06 Mar 2014 =E0 16:44:29 (+0100), Kevin Wolf wrote : > Signed-off-by: Kevin Wolf > --- > tests/qemu-iotests/087 | 122 +++++++++++++++++++++++++++++++++++++= ++++++++ > tests/qemu-iotests/087.out | 40 +++++++++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 163 insertions(+) > create mode 100755 tests/qemu-iotests/087 > create mode 100644 tests/qemu-iotests/087.out >=20 > diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 > new file mode 100755 > index 0000000..53b6c43 > --- /dev/null > +++ b/tests/qemu-iotests/087 > @@ -0,0 +1,122 @@ > +#!/bin/bash > +# > +# Test unsupported blockdev-add cases > +# > +# Copyright (C) 2014 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 = . > +# > + > +# creator > +owner=3Dkwolf@redhat.com > + > +seq=3D`basename $0` > +echo "QA output created by $seq" > + > +here=3D`pwd` > +tmp=3D/tmp/$$ > +status=3D1 # failure is the default! > + > +# get standard environment, filters and checks > +. ./common.rc > +. ./common.filter > + > +_supported_fmt qcow2 > +_supported_proto file > +_supported_os Linux > + > +function do_run_qemu() > +{ > + echo Testing: "$@" > + $QEMU -nographic -qmp stdio -serial none "$@" > + echo > +} > + > +function run_qemu() > +{ > + do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | sed -e 's/= \("actual-size":\s*\)[0-9]\+/\1SIZE/g' > +} > + > +size=3D128M > + > +_make_test_img $size > + > +echo > +echo =3D=3D=3D Missing ID =3D=3D=3D > +echo > + > +run_qemu < +{ "execute": "qmp_capabilities" } > +{ "execute": "blockdev-add", > + "arguments": { > + "options": { > + "driver": "$IMGFMT", > + "file": { > + "driver": "file", > + "filename": "$TEST_IMG" > + } > + } > + } > + } > +{ "execute": "quit" } > +EOF > + > +echo > +echo =3D=3D=3D aio=3Dnative without O_DIRECT =3D=3D=3D > +echo > + > +run_qemu < +{ "execute": "qmp_capabilities" } > +{ "execute": "blockdev-add", > + "arguments": { > + "options": { > + "driver": "$IMGFMT", > + "id": "disk", > + "aio": "native", > + "file": { > + "driver": "file", > + "filename": "$TEST_IMG" > + } > + } > + } > + } > +{ "execute": "quit" } > +EOF > + > +echo > +echo =3D=3D=3D Encrypted image =3D=3D=3D > +echo > + > +_make_test_img -o encryption=3Don $size > +run_qemu < +{ "execute": "qmp_capabilities" } > +{ "execute": "blockdev-add", > + "arguments": { > + "options": { > + "driver": "$IMGFMT", > + "id": "disk", > + "file": { > + "driver": "file", > + "filename": "$TEST_IMG" > + } > + } > + } > + } > +{ "execute": "quit" } > +EOF > + > +# success, all done > +echo "*** done" > +rm -f $seq.full > +status=3D0 > diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out > new file mode 100644 > index 0000000..b871032 > --- /dev/null > +++ b/tests/qemu-iotests/087.out > @@ -0,0 +1,40 @@ > +QA output created by 087 > +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728=20 > + > +=3D=3D=3D Missing ID =3D=3D=3D > + > +Testing: > +QMP_VERSION > +{"return": {}} > +{"error": {"class": "GenericError", "desc": "Block device needs an ID"= }} > +{"return": {}} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "SHUTDOWN"} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": tr= ue}} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": tru= e}} > + > + > +=3D=3D=3D aio=3Dnative without O_DIRECT =3D=3D=3D > + > +Testing: > +QMP_VERSION > +{"return": {}} > +{"error": {"class": "GenericError", "desc": "aio=3Dnative requires cac= he.direct=3Dtrue"}} > +{"return": {}} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "SHUTDOWN"} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": tr= ue}} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": tru= e}} > + > + > +=3D=3D=3D Encrypted image =3D=3D=3D > + > +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 encrypti= on=3Don=20 > +Testing: > +QMP_VERSION > +{"return": {}} > +{"error": {"class": "GenericError", "desc": "blockdev-add doesn't supp= ort encrypted devices"}} > +{"return": {}} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "SHUTDOWN"} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": tr= ue}} > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "ev= ent": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": tru= e}} > + > +*** done > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > index 901730d..9ec62d2 100644 > --- a/tests/qemu-iotests/group > +++ b/tests/qemu-iotests/group > @@ -86,3 +86,4 @@ > 081 rw auto > 082 rw auto quick > 086 rw auto quick > +087 rw auto quick > --=20 > 1.8.1.4 >=20 >=20 Reviewed-by: Benoit Canet