Skip to contentSkip to conversation

tests: Fix test 049 fallout from improved HMP error messages

PATCH Applied Eric Blake 5 participants 5 messages Sep 22, 2015 – Sep 24, 2015

lore
Share & tools
lore

Eric Blake

author
#0 lore raw

PATCH 1/1 tests: Fix test 049 fallout from improved HMP error messages

Commit 50b7b000 improved HMP error messages, but forgot to update qemu-iotests to match.

---

I'm not sure if this should go through Markus' "error" tree, since that's where the break was introduced, or through a "block" tree since it touches qemu-iotests.

And now that I have a recipe for running qemu-iotests, I should have no excuse for repeating this type of mistake :)

 tests/qemu-iotests/049.out | 1 +
 1 file changed, 1 insertion(+)
tests/qemu-iotests/049.out +1 -0
index 0425ae0..a2b6703 100644
@@ -118,6 +118,7 @@ qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes.
 
 qemu-img create -f qcow2 -o size=foobar TEST_DIR/t.qcow2
 qemu-img: Parameter 'size' expects a size
+You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and terabytes.
 qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'
 
 == Check correct interpretation of suffixes for cluster size ==
Signature · 1 line
2.4.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 23 lines · Eric Blake

Commit 50b7b000 improved HMP error messages, but forgot to update qemu-iotests to match.

---

I'm not sure if this should go through Markus' "error" tree, since that's where the break was introduced, or through a "block" tree since it touches qemu-iotests.

And now that I have a recipe for running qemu-iotests, I should have no excuse for repeating this type of mistake :)

 tests/qemu-iotests/049.out | 1 +
 1 file changed, 1 insertion(+)
tests/qemu-iotests/049.out +0 -0
index 0425ae0..a2b6703 100644

tests/qemu-iotests/049.out qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes. · line 124

Quoted 7 lines
tests/qemu-iotests/049.out +1 -0
@@ -118,6 +118,7 @@ qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes.
 
 qemu-img create -f qcow2 -o size=foobar TEST_DIR/t.qcow2
 qemu-img: Parameter 'size' expects a size
+You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and terabytes.
 qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'
 
 == Check correct interpretation of suffixes for cluster size ==

Grazie,

Applied
#3 lore raw
In reply to Eric Blake

Am 23.09.2015 um 01:15 hat Eric Blake geschrieben:

Quoted 5 lines

Commit 50b7b000 improved HMP error messages, but forgot to update qemu-iotests to match.

Thanks, applied to the block branch.

Quoted 3 lines

I'm not sure if this should go through Markus' "error" tree, since that's where the break was introduced, or through a "block" tree since it touches qemu-iotests.

Doesn't really matter as long as someone takes it. And if both took it, I think git should be clever enough to figure it out without merge conflicts.

Kevin

#4 lore raw
Quoted 12 lines · Kevin Wolf

Am 23.09.2015 um 01:15 hat Eric Blake geschrieben:

Quoted 5 lines

Commit 50b7b000 improved HMP error messages, but forgot to update qemu-iotests to match.

Thanks, applied to the block branch.

Quoted 3 lines

I'm not sure if this should go through Markus' "error" tree, since that's where the break was introduced, or through a "block" tree since it touches qemu-iotests.

You copied both maintainers, so they can figure it out. Good move.

Quoted 3 lines

Doesn't really matter as long as someone takes it. And if both took it, I think git should be clever enough to figure it out without merge conflicts.

Since you took it, I won't. Thanks!