The error message has changed recently, breaking the test. Fix it.
Fixes: a2b333c01880f56056d50c238834d62e32001e54
("block: nbd: Fix convert qcow2 compressed to nbd")
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/259.out | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/259.out b/tests/qemu-iotests/259.out
index e27b9ff38d..1aaadfda4e 100644
--- a/tests/qemu-iotests/259.out
+++ b/tests/qemu-iotests/259.out
@@ -10,5 +10,5 @@ disk size: unavailable
--- Testing creation for which the node would need to grow ---
Formatting 'TEST_DIR/t.IMGFMT', fmt=qcow2 size=67108864 preallocation=metadata
-qemu-img: TEST_DIR/t.IMGFMT: Could not resize image: Image format driver does not support resize
+qemu-img: TEST_DIR/t.IMGFMT: Could not resize image: Cannot grow NBD nodes
*** done
--
2.26.2
On 8/11/20 3:08 AM, Max Reitz wrote: > The error message has changed recently, breaking the test. Fix it. > > Fixes: a2b333c01880f56056d50c238834d62e32001e54 > ("block: nbd: Fix convert qcow2 compressed to nbd") > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/259.out | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Eric Blake <eblake@redhat.com> I'm happy to let this go through your iotests tree, or I can queue it through my NBD tree, whichever gets a 5.2 pull request first. (Fixing it for -rc4 does not seem justified, even though it is annoying to have a release with the test broken) > > diff --git a/tests/qemu-iotests/259.out b/tests/qemu-iotests/259.out > index e27b9ff38d..1aaadfda4e 100644 > --- a/tests/qemu-iotests/259.out > +++ b/tests/qemu-iotests/259.out > @@ -10,5 +10,5 @@ disk size: unavailable > > --- Testing creation for which the node would need to grow --- > Formatting 'TEST_DIR/t.IMGFMT', fmt=qcow2 size=67108864 preallocation=metadata > -qemu-img: TEST_DIR/t.IMGFMT: Could not resize image: Image format driver does not support resize > +qemu-img: TEST_DIR/t.IMGFMT: Could not resize image: Cannot grow NBD nodes > *** done > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
On Tue, Aug 11, 2020 at 11:08 AM Max Reitz <mreitz@redhat.com> wrote: > The error message has changed recently, breaking the test. Fix it. > > Fixes: a2b333c01880f56056d50c238834d62e32001e54 > ("block: nbd: Fix convert qcow2 compressed to nbd") > Thanks for fixing this. I thought that I ran all the tests when I submitted the change. Is this new test that was not available in master when I submitted this, or maybe I missed something when running the tests? I think I ran the tests using: SPEED=thorough check-block.sh Nir > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/259.out | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/qemu-iotests/259.out b/tests/qemu-iotests/259.out > index e27b9ff38d..1aaadfda4e 100644 > --- a/tests/qemu-iotests/259.out > +++ b/tests/qemu-iotests/259.out > @@ -10,5 +10,5 @@ disk size: unavailable > > --- Testing creation for which the node would need to grow --- > Formatting 'TEST_DIR/t.IMGFMT', fmt=qcow2 size=67108864 > preallocation=metadata > -qemu-img: TEST_DIR/t.IMGFMT: Could not resize image: Image format driver > does not support resize > +qemu-img: TEST_DIR/t.IMGFMT: Could not resize image: Cannot grow NBD nodes > *** done > -- > 2.26.2 > > >
On 8/11/20 10:54 AM, Nir Soffer wrote: > On Tue, Aug 11, 2020 at 11:08 AM Max Reitz <mreitz@redhat.com> wrote: > >> The error message has changed recently, breaking the test. Fix it. >> >> Fixes: a2b333c01880f56056d50c238834d62e32001e54 >> ("block: nbd: Fix convert qcow2 compressed to nbd") >> > > Thanks for fixing this. I thought that I ran all the tests when I submitted > the change. > > Is this new test that was not available in master when I submitted this, or > maybe I > missed something when running the tests? More likely the latter. 'make check' runs a subset of iotests under a subset of options, so this must not have been one of those options (or CI would have caught it sooner). Running it manually with './check -nbd 256' sees it, though. > > I think I ran the tests using: > > SPEED=thorough check-block.sh > My fault as well, since it was a rather late patch and I was trying to get it in -rc3, so I didn't complete as many tests on it as I would have liked before submitting the pull request. Ah well, it won't be the first release with a broken iotest. (Or if we really _do_ need -rc4, I can add this to the queue of nice-to-have) -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
© 2016 - 2024 Red Hat, Inc.