| Message ID | 20180312152126.286890-9-vsementsov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | nbd block status base:allocation | expand |
On 03/12/2018 10:21 AM, Vladimir Sementsov-Ogievskiy wrote: > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > > + > +iotests.verify_image_format(supported_fmts=['qcow2']) Interesting that './check -nbd' doesn't run 209 (because that defaults to format -raw, but we need format -qcow2), but './check -nbd' and './check -qcow2 -nbd' do run it, so I've tested that it passes, and is quick. > + > +disk, nbd_sock = file_path('disk', 'nbd-sock') > +nbd_uri = 'nbd+unix:///exp?socket=' + nbd_sock > + > +qemu_img_create('-f', iotests.imgfmt, disk, '1M') > +qemu_io('-f', iotests.imgfmt, '-c', 'write 0 512K', disk) > + > +qemu_nbd('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, disk) > +qemu_img_verbose('map', '-f', 'raw', '--output=json', nbd_uri) And this one is easy enough to reproduce, whether I use shell or python. (Better than some of the python iotests that just have a line of '.....' where you have to scratch your head at how to reproduce failures). Reviewed-by: Eric Blake <eblake@redhat.com> > +++ b/tests/qemu-iotests/group > @@ -202,3 +202,4 @@ > 203 rw auto > 204 rw auto quick > 205 rw auto quick > +209 rw auto quick the obvious context conflict as other tests land into master, but I don't mind that ;)
diff --git a/tests/qemu-iotests/209 b/tests/qemu-iotests/209 new file mode 100755 index 0000000000..259e991ec6 --- /dev/null +++ b/tests/qemu-iotests/209 @@ -0,0 +1,34 @@ +#!/usr/bin/env python +# +# Tests for NBD BLOCK_STATUS extension +# +# Copyright (c) 2018 Virtuozzo International GmbH +# +# 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/>. +# + +import iotests +from iotests import qemu_img_create, qemu_io, qemu_img_verbose, qemu_nbd, \ + file_path + +iotests.verify_image_format(supported_fmts=['qcow2']) + +disk, nbd_sock = file_path('disk', 'nbd-sock') +nbd_uri = 'nbd+unix:///exp?socket=' + nbd_sock + +qemu_img_create('-f', iotests.imgfmt, disk, '1M') +qemu_io('-f', iotests.imgfmt, '-c', 'write 0 512K', disk) + +qemu_nbd('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, disk) +qemu_img_verbose('map', '-f', 'raw', '--output=json', nbd_uri) diff --git a/tests/qemu-iotests/209.out b/tests/qemu-iotests/209.out new file mode 100644 index 0000000000..0d29724e84 --- /dev/null +++ b/tests/qemu-iotests/209.out @@ -0,0 +1,2 @@ +[{ "start": 0, "length": 524288, "depth": 0, "zero": false, "data": true}, +{ "start": 524288, "length": 524288, "depth": 0, "zero": true, "data": false}] diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index a2dfe79d86..c16343016c 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -202,3 +202,4 @@ 203 rw auto 204 rw auto quick 205 rw auto quick +209 rw auto quick
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- v2: mv 206 209, make test file executable tests/qemu-iotests/209 | 34 ++++++++++++++++++++++++++++++++++ tests/qemu-iotests/209.out | 2 ++ tests/qemu-iotests/group | 1 + 3 files changed, 37 insertions(+) create mode 100755 tests/qemu-iotests/209 create mode 100644 tests/qemu-iotests/209.out