tests/qemu-iotests: Fix more reference output files due to recent qemu-io change

[Qemu-devel] [PATCH] tests/qemu-iotests: Fix more reference output files due to recent qemu-io change

Posted by Thomas Huth 6 years, 6 months ago

The output of qemu-io changed recently - most tests have been fixed in
commit 36b9986b08787019ef42 ("tests/qemu-iotests: Fix output of qemu-io
related tests") already, but the qcow1 and the vmdk test was still missing.

Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/059.out |  8 ++++----
 tests/qemu-iotests/092.out | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index 700ad1f290..f51394ae8e 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -2,15 +2,15 @@ QA output created by 059
 
 === Testing invalid granularity ===
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.vmdk: Invalid granularity, image may be corrupt
+qemu-io: can't open device TEST_DIR/t.vmdk: Invalid granularity, image may be corrupt
 
 === Testing too big L2 table size ===
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.vmdk: L2 table size too big
+qemu-io: can't open device TEST_DIR/t.vmdk: L2 table size too big
 
 === Testing too big L1 table size ===
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.vmdk: L1 size too big
+qemu-io: can't open device TEST_DIR/t.vmdk: L1 size too big
 
 === Testing monolithicFlat creation and opening ===
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
@@ -2050,7 +2050,7 @@ wrote 512/512 bytes at offset 10240
 
 === Testing monolithicFlat with internally generated JSON file name ===
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 subformat=monolithicFlat
-can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}'
+qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}'
 
 === Testing version 3 ===
 image: TEST_DIR/iotest-version3.IMGFMT
diff --git a/tests/qemu-iotests/092.out b/tests/qemu-iotests/092.out
index 6eda321fc6..3e79914873 100644
--- a/tests/qemu-iotests/092.out
+++ b/tests/qemu-iotests/092.out
@@ -2,25 +2,25 @@ QA output created by 092
 
 == Invalid cluster size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
-can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
-can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
-can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
+qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
+qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
+qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
+qemu-io: can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
 
 == Invalid L2 table size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
-can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
-can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
-can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
+qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
+qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
+qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
+qemu-io: can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
 
 == Invalid size ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow: Image too large
-can't open device TEST_DIR/t.qcow: Image too large
+qemu-io: can't open device TEST_DIR/t.qcow: Image too large
+qemu-io: can't open device TEST_DIR/t.qcow: Image too large
 
 == Invalid backing file length ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow: Backing file name too long
-can't open device TEST_DIR/t.qcow: Backing file name too long
+qemu-io: can't open device TEST_DIR/t.qcow: Backing file name too long
+qemu-io: can't open device TEST_DIR/t.qcow: Backing file name too long
 *** done
-- 
2.21.0

Re: [Qemu-devel] [PATCH] tests/qemu-iotests: Fix more reference output files due to recent qemu-io change

Posted by Max Reitz 6 years, 6 months ago

On 01.05.19 15:41, Thomas Huth wrote:
> The output of qemu-io changed recently - most tests have been fixed in
> commit 36b9986b08787019ef42 ("tests/qemu-iotests: Fix output of qemu-io
> related tests") already, but the qcow1 and the vmdk test was still missing.
> 
> Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qemu-iotests/059.out |  8 ++++----
>  tests/qemu-iotests/092.out | 24 ++++++++++++------------
>  2 files changed, 16 insertions(+), 16 deletions(-)

Hmm, nbd's 083 is also broken.  Would you mind fixing that, too? O:-)

Max

Re: [Qemu-devel] [PATCH] tests/qemu-iotests: Fix more reference output files due to recent qemu-io change

Posted by Eric Blake 6 years, 6 months ago

On 5/6/19 10:32 AM, Max Reitz wrote:
> On 01.05.19 15:41, Thomas Huth wrote:
>> The output of qemu-io changed recently - most tests have been fixed in
>> commit 36b9986b08787019ef42 ("tests/qemu-iotests: Fix output of qemu-io
>> related tests") already, but the qcow1 and the vmdk test was still missing.
>>
>> Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  tests/qemu-iotests/059.out |  8 ++++----
>>  tests/qemu-iotests/092.out | 24 ++++++++++++------------
>>  2 files changed, 16 insertions(+), 16 deletions(-)
> 
> Hmm, nbd's 083 is also broken.  Would you mind fixing that, too? O:-)
> 

See below for what to squash in. With that, I can give:
Reviewed-by: Eric Blake <eblake@redhat.com>

In fact, I don't mind taking it through my NBD tree, since there is at
least one other iotest fix for NBD pending.

diff --git i/tests/qemu-iotests/083.out w/tests/qemu-iotests/083.out
index 7419722cd7a..eee6dd13794 100644
--- i/tests/qemu-iotests/083.out
+++ w/tests/qemu-iotests/083.out
@@ -1,43 +1,43 @@
 QA output created by 083
 === Check disconnect before neg1 ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect after neg1 ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect 8 neg1 ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect 16 neg1 ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect before export ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect after export ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect 4 export ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect 12 export ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect 16 export ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect before neg2 ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect after neg2 ===

@@ -45,11 +45,11 @@ read failed: Input/output error

 === Check disconnect 8 neg2 ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect 10 neg2 ===

-can't open device nbd+tcp://127.0.0.1:PORT/foo
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/foo

 === Check disconnect before request ===

@@ -86,23 +86,23 @@ read 512/512 bytes at offset 0

 === Check disconnect before neg-classic ===

-can't open device nbd+tcp://127.0.0.1:PORT/
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/

 === Check disconnect 8 neg-classic ===

-can't open device nbd+tcp://127.0.0.1:PORT/
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/

 === Check disconnect 16 neg-classic ===

-can't open device nbd+tcp://127.0.0.1:PORT/
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/

 === Check disconnect 24 neg-classic ===

-can't open device nbd+tcp://127.0.0.1:PORT/
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/

 === Check disconnect 28 neg-classic ===

-can't open device nbd+tcp://127.0.0.1:PORT/
+qemu-io: can't open device nbd+tcp://127.0.0.1:PORT/

 === Check disconnect after neg-classic ===

@@ -110,43 +110,43 @@ read failed: Input/output error

 === Check disconnect before neg1 ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect after neg1 ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect 8 neg1 ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect 16 neg1 ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect before export ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect after export ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect 4 export ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect 12 export ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect 16 export ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect before neg2 ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect after neg2 ===

@@ -154,11 +154,11 @@ read failed: Input/output error

 === Check disconnect 8 neg2 ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect 10 neg2 ===

-can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock

 === Check disconnect before request ===

@@ -195,23 +195,23 @@ read 512/512 bytes at offset 0

 === Check disconnect before neg-classic ===

-can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock

 === Check disconnect 8 neg-classic ===

-can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock

 === Check disconnect 16 neg-classic ===

-can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock

 === Check disconnect 24 neg-classic ===

-can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock

 === Check disconnect 28 neg-classic ===

-can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock
+qemu-io: can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock

 === Check disconnect after neg-classic ===


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

Re: [Qemu-devel] [PATCH] tests/qemu-iotests: Fix more reference output files due to recent qemu-io change

Posted by Thomas Huth 6 years, 6 months ago

On 06/05/2019 18.52, Eric Blake wrote:
> On 5/6/19 10:32 AM, Max Reitz wrote:
>> On 01.05.19 15:41, Thomas Huth wrote:
>>> The output of qemu-io changed recently - most tests have been fixed in
>>> commit 36b9986b08787019ef42 ("tests/qemu-iotests: Fix output of qemu-io
>>> related tests") already, but the qcow1 and the vmdk test was still missing.
>>>
>>> Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>  tests/qemu-iotests/059.out |  8 ++++----
>>>  tests/qemu-iotests/092.out | 24 ++++++++++++------------
>>>  2 files changed, 16 insertions(+), 16 deletions(-)
>>
>> Hmm, nbd's 083 is also broken.  Would you mind fixing that, too? O:-)
>>
> 
> See below for what to squash in. With that, I can give:
> Reviewed-by: Eric Blake <eblake@redhat.com>
> 
> In fact, I don't mind taking it through my NBD tree, since there is at
> least one other iotest fix for NBD pending.

Thanks! I assume you can fix up the patch, or do you want me to resend it?

 Thomas

Re: [Qemu-devel] [Qemu-block] [PATCH] tests/qemu-iotests: Fix more reference output files due to recent qemu-io change

Posted by Stefano Garzarella 6 years, 6 months ago

On Wed, May 01, 2019 at 03:41:27PM +0200, Thomas Huth wrote:
> The output of qemu-io changed recently - most tests have been fixed in
> commit 36b9986b08787019ef42 ("tests/qemu-iotests: Fix output of qemu-io
> related tests") already, but the qcow1 and the vmdk test was still missing.
> 
> Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qemu-iotests/059.out |  8 ++++----
>  tests/qemu-iotests/092.out | 24 ++++++++++++------------
>  2 files changed, 16 insertions(+), 16 deletions(-)
> 

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Tested-by: Stefano Garzarella <sgarzare@redhat.com>

Thanks,
Stefano