[PATCH 0/1] iotests: fix 051.out expected output after error

[PATCH 0/1] iotests: fix 051.out expected output after error

[Connor Kuehl]

Oops, sorry about the churn. I can see why this would have caused a
failure but I'm surprised I can't reproduce this when I run the test
locally.

Christian, would you be willing to test this patch out as a quick sanity
check too?

Connor Kuehl (1):
  iotests: fix 051.out expected output after error text touchups

 tests/qemu-iotests/051.out | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.30.2

[PATCH 1/1] iotests: fix 051.out expected output after error text touchups

[Connor Kuehl]

A patch was recently applied that touched up some error messages that
pertained to key names like 'node-name'. The trouble is it only updated
tests/qemu-iotests/051.pc.out and not tests/qemu-iotests/051.out as
well.

Do that now.

Fixes: 785ec4b1b9 ("block: Clarify error messages pertaining to
'node-name'")
Signed-off-by: Connor Kuehl <ckuehl@redhat.com>
---
 tests/qemu-iotests/051.out | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index de4771bcb3..db8c14b903 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -61,13 +61,13 @@ QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) quit
 
 Testing: -drive file=TEST_DIR/t.qcow2,node-name=123foo
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=123foo: Invalid node name
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=123foo: Invalid node-name: '123foo'
 
 Testing: -drive file=TEST_DIR/t.qcow2,node-name=_foo
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=_foo: Invalid node name
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=_foo: Invalid node-name: '_foo'
 
 Testing: -drive file=TEST_DIR/t.qcow2,node-name=foo#12
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=foo#12: Invalid node name
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=foo#12: Invalid node-name: 'foo#12'
 
 
 === Device without drive ===
-- 
2.30.2

Re: [PATCH 1/1] iotests: fix 051.out expected output after error text touchups

[Christian Borntraeger]

On 18.03.21 21:09, Connor Kuehl wrote:
> A patch was recently applied that touched up some error messages that
> pertained to key names like 'node-name'. The trouble is it only updated
> tests/qemu-iotests/051.pc.out and not tests/qemu-iotests/051.out as
> well.
> 
> Do that now.
> 
> Fixes: 785ec4b1b9 ("block: Clarify error messages pertaining to
> 'node-name'")
> Signed-off-by: Connor Kuehl <ckuehl@redhat.com>

Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>

Thanks for the quick response.

> ---
>   tests/qemu-iotests/051.out | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
> index de4771bcb3..db8c14b903 100644
> --- a/tests/qemu-iotests/051.out
> +++ b/tests/qemu-iotests/051.out
> @@ -61,13 +61,13 @@ QEMU X.Y.Z monitor - type 'help' for more information
>   (qemu) quit
>   
>   Testing: -drive file=TEST_DIR/t.qcow2,node-name=123foo
> -QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=123foo: Invalid node name
> +QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=123foo: Invalid node-name: '123foo'
>   
>   Testing: -drive file=TEST_DIR/t.qcow2,node-name=_foo
> -QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=_foo: Invalid node name
> +QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=_foo: Invalid node-name: '_foo'
>   
>   Testing: -drive file=TEST_DIR/t.qcow2,node-name=foo#12
> -QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=foo#12: Invalid node name
> +QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=foo#12: Invalid node-name: 'foo#12'
>   
>   
>   === Device without drive ===
> 

Re: [PATCH 1/1] iotests: fix 051.out expected output after error text touchups

[John Snow]

On 3/18/21 4:09 PM, Connor Kuehl wrote:
> A patch was recently applied that touched up some error messages that
> pertained to key names like 'node-name'. The trouble is it only updated
> tests/qemu-iotests/051.pc.out and not tests/qemu-iotests/051.out as
> well.
> 
> Do that now.
> 
> Fixes: 785ec4b1b9 ("block: Clarify error messages pertaining to
> 'node-name'")
> Signed-off-by: Connor Kuehl <ckuehl@redhat.com>

Reviewed-by: John Snow <jsnow@redhat.com>

> ---
>   tests/qemu-iotests/051.out | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
> index de4771bcb3..db8c14b903 100644
> --- a/tests/qemu-iotests/051.out
> +++ b/tests/qemu-iotests/051.out
> @@ -61,13 +61,13 @@ QEMU X.Y.Z monitor - type 'help' for more information
>   (qemu) quit
>   
>   Testing: -drive file=TEST_DIR/t.qcow2,node-name=123foo
> -QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=123foo: Invalid node name
> +QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=123foo: Invalid node-name: '123foo'
>   
>   Testing: -drive file=TEST_DIR/t.qcow2,node-name=_foo
> -QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=_foo: Invalid node name
> +QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=_foo: Invalid node-name: '_foo'
>   
>   Testing: -drive file=TEST_DIR/t.qcow2,node-name=foo#12
> -QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=foo#12: Invalid node name
> +QEMU_PROG: -drive file=TEST_DIR/t.qcow2,node-name=foo#12: Invalid node-name: 'foo#12'
>   
>   
>   === Device without drive ===
> 

Re: [PATCH 0/1] iotests: fix 051.out expected output after error

[Max Reitz]

On 18.03.21 21:09, Connor Kuehl wrote:
> Oops, sorry about the churn. I can see why this would have caused a
> failure but I'm surprised I can't reproduce this when I run the test
> locally.
> 
> Christian, would you be willing to test this patch out as a quick sanity
> check too?
> 
> Connor Kuehl (1):
>    iotests: fix 051.out expected output after error text touchups
> 
>   tests/qemu-iotests/051.out | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)

Thanks, applied to my block branch:

https://git.xanclic.moe/XanClic/qemu/commits/branch/block

Max