Commit e74ee02c authored by Thomas Huth's avatar Thomas Huth Committed by Eric Blake
Browse files

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



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

Fixes: 99e98d7c ("qemu-io: Use error_[gs]et_progname()")
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <20190501134127.21104-1-thuth@redhat.com>
[eblake: squash in NBD 083 fixes]
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Tested-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 876df72d

tests/qemu-iotests/059.out

+4 −4
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/083.out

+34 −34
Original line number Diff line number Diff line 
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 ===

tests/qemu-iotests/092.out

+12 −12
Original line number Diff line number Diff line
@@ -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