Skip to contentSkip to conversation

iotests/259: Fix reference output

PATCH In review Max Reitz 3 participants 4 messages Aug 11, 2020

lore
Share & tools
lore

Max Reitz

author
#0 lore raw

PATCH 1/1 iotests/259: Fix reference output

The error message has changed recently, breaking the test. Fix it.

Fixes a2b333c01880f56056d50c238834d62e32001e54

("block: nbd: Fix convert qcow2 compressed to nbd")

---
 tests/qemu-iotests/259.out | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/259.out +1 -1
index e27b9ff38d..1aaadfda4e 100644
@@ -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
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Max Reitz

The error message has changed recently, breaking the test. Fix it.

Fixes a2b333c01880f56056d50c238834d62e32001e54

("block: nbd: Fix convert qcow2 compressed to nbd")

---
  tests/qemu-iotests/259.out | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

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)

Quoted 13 lines
tests/qemu-iotests/259.out +1 -1
index e27b9ff38d..1aaadfda4e 100644
@@ -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
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#2 lore raw
In reply to Max Reitz
Quoted 5 lines · Max Reitz

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

Quoted 23 lines
---
 tests/qemu-iotests/259.out | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/259.out +0 -0
index e27b9ff38d..1aaadfda4e 100644
@@ -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

#3 lore raw
Quoted 8 lines · Nir Soffer
Quoted 5 lines · Max Reitz

The error message has changed recently, breaking the test. Fix it.

Fixes a2b333c01880f56056d50c238834d62e32001e54

("block: nbd: Fix convert qcow2 compressed to nbd")

Quoted 6 lines

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.

Quoted 5 lines

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)

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org