| Message ID | 20210209181923.497688-1-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iotests/210: Fix reference output | expand |
On 2/9/21 12:19 PM, Max Reitz wrote: > Commit 69b55e03f has changed an error message, adjust the reference > output to account for it. > > Fixes: 69b55e03f7e65a36eb954d0b7d4698b258df2708 > ("block: refactor bdrv_check_request: add errp") > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- Reviewed-by: Eric Blake <eblake@redhat.com> I'm happy to queue this through my tree (since that's where the original came through) if you don't beat me to it.
09.02.2021 21:19, Max Reitz wrote: > Commit 69b55e03f has changed an error message, adjust the reference > output to account for it. > > Fixes: 69b55e03f7e65a36eb954d0b7d4698b258df2708 > ("block: refactor bdrv_check_request: add errp") > Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > Fun fact: The branch name "fix-210-v1" was already taken for > 8ba9c4d9b088d66aebfcb019f61ddc36fba2db88, which was only two months > ago. Ah, well. :) Me again :( Hmm. I should definitely start running iotests with -luks, not only my favorite -raw, -qcow2, -nbd. Sorry. > --- > tests/qemu-iotests/210.out | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out > index dc1a3c9786..2e9fc596eb 100644 > --- a/tests/qemu-iotests/210.out > +++ b/tests/qemu-iotests/210.out > @@ -182,7 +182,7 @@ Job failed: The requested file size is too large > === Resize image with invalid sizes === > > {"execute": "block_resize", "arguments": {"node-name": "node1", "size": 9223372036854775296}} > -{"error": {"class": "GenericError", "desc": "Required too big image size, it must be not greater than 9223372035781033984"}} > +{"error": {"class": "GenericError", "desc": "offset(9223372036854775296) exceeds maximum(9223372035781033984)"}} > {"execute": "block_resize", "arguments": {"node-name": "node1", "size": 9223372036854775808}} > {"error": {"class": "GenericError", "desc": "Invalid parameter type for 'size', expected: integer"}} > {"execute": "block_resize", "arguments": {"node-name": "node1", "size": 18446744073709551104}} >
Am 09.02.2021 um 19:19 hat Max Reitz geschrieben: > Commit 69b55e03f has changed an error message, adjust the reference > output to account for it. > > Fixes: 69b55e03f7e65a36eb954d0b7d4698b258df2708 > ("block: refactor bdrv_check_request: add errp") > Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> > diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out > index dc1a3c9786..2e9fc596eb 100644 > --- a/tests/qemu-iotests/210.out > +++ b/tests/qemu-iotests/210.out > @@ -182,7 +182,7 @@ Job failed: The requested file size is too large > === Resize image with invalid sizes === > > {"execute": "block_resize", "arguments": {"node-name": "node1", "size": 9223372036854775296}} > -{"error": {"class": "GenericError", "desc": "Required too big image size, it must be not greater than 9223372035781033984"}} > +{"error": {"class": "GenericError", "desc": "offset(9223372036854775296) exceeds maximum(9223372035781033984)"}} This doesn't exactly feel like an improved error message... Kevin
diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out index dc1a3c9786..2e9fc596eb 100644 --- a/tests/qemu-iotests/210.out +++ b/tests/qemu-iotests/210.out @@ -182,7 +182,7 @@ Job failed: The requested file size is too large === Resize image with invalid sizes === {"execute": "block_resize", "arguments": {"node-name": "node1", "size": 9223372036854775296}} -{"error": {"class": "GenericError", "desc": "Required too big image size, it must be not greater than 9223372035781033984"}} +{"error": {"class": "GenericError", "desc": "offset(9223372036854775296) exceeds maximum(9223372035781033984)"}} {"execute": "block_resize", "arguments": {"node-name": "node1", "size": 9223372036854775808}} {"error": {"class": "GenericError", "desc": "Invalid parameter type for 'size', expected: integer"}} {"execute": "block_resize", "arguments": {"node-name": "node1", "size": 18446744073709551104}}
Commit 69b55e03f has changed an error message, adjust the reference output to account for it. Fixes: 69b55e03f7e65a36eb954d0b7d4698b258df2708 ("block: refactor bdrv_check_request: add errp") Signed-off-by: Max Reitz <mreitz@redhat.com> --- Fun fact: The branch name "fix-210-v1" was already taken for 8ba9c4d9b088d66aebfcb019f61ddc36fba2db88, which was only two months ago. Ah, well. :) --- tests/qemu-iotests/210.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)