Update output of some iotests
v3 cover Update output of some iotests
Hi,
I sent a patch a few days ago correction the output of iotests 051 and
186. I wanted to resend it again but I noticed that 186 needs now more changes due to commit ac64273c66ab136c44043259162, so I'm including those changes too.
Regards,
Berto
Alberto Garcia (2):
iotests: Update 051 and 186 after commit 1454509726719e0933c
iotests: Update 186 after commit ac64273c66ab136c44043259162
tests/qemu-iotests/051.pc.out | 20 -------------------- tests/qemu-iotests/186 | 4 ---- tests/qemu-iotests/186.out | 32 ++------------------------------ 3 files changed, 2 insertions(+), 54 deletions(-)
Signature · 1 line
2.11.0
PATCH v3 1/2 iotests: Update 051 and 186 after commit 1454509726719e0933c
SCSI controllers are no longer created automatically for -drive if=scsi, so this patch updates the tests that relied on that.
--- tests/qemu-iotests/051.pc.out | 20 -------------------- tests/qemu-iotests/186 | 4 ---- tests/qemu-iotests/186.out | 28 ---------------------------- 3 files changed, 52 deletions(-)
tests/qemu-iotests/051.pc.out +0 -20
@@ -117,20 +117,10 @@ Testing: -drive if=ide,media=cdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit -Testing: -drive if=scsi,media=cdrom -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type -quit - Testing: -drive if=ide QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty -Testing: -drive if=scsi -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=scsi: warning: bus=0,unit=0 is deprecated with this machine type -QEMU_PROG: -drive if=scsi: Device needs media, but drive is empty - Testing: -drive if=virtio QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -drive if=virtio: Device needs media, but drive is empty
@@ -170,20 +160,10 @@ Testing: -drive file=TEST_DIR/t.qcow2,if=ide,media=cdrom,readonly=on QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,media=cdrom,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type -quit - Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only -Testing: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=scsi,readonly=on: warning: bus=0,unit=0 is deprecated with this machine type -quit - Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit
tests/qemu-iotests/186 +0 -4
@@ -133,10 +133,6 @@ check_info_block -drive if=ide,driver=null-co check_info_block -drive if=ide,media=cdrom check_info_block -drive if=ide,driver=null-co,media=cdrom -check_info_block -drive if=scsi,driver=null-co -check_info_block -drive if=scsi,media=cdrom -check_info_block -drive if=scsi,driver=null-co,media=cdrom - check_info_block -drive if=virtio,driver=null-co check_info_block -drive if=pflash,driver=null-co,size=1M
tests/qemu-iotests/186.out +0 -28
@@ -442,34 +442,6 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only) Cache mode: writeback (qemu) quit -Testing: -drive if=scsi,driver=null-co -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is deprecated with this machine type -info block -scsi0-hd0 (NODE_NAME): null-co:// (null-co) - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0] - Cache mode: writeback -(qemu) quit - -Testing: -drive if=scsi,media=cdrom -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type -info block -scsi0-cd0: [not inserted] - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0] - Removable device: not locked, tray closed -(qemu) quit - -Testing: -drive if=scsi,driver=null-co,media=cdrom -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -drive if=scsi,driver=null-co,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type -info block -scsi0-cd0 (NODE_NAME): null-co:// (null-co, read-only) - Attached to: /machine/unattached/device[27]/scsi.0/legacy[0] - Removable device: not locked, tray closed - Cache mode: writeback -(qemu) quit - Testing: -drive if=virtio,driver=null-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block
Signature · 1 line
2.11.0
PATCH v3 2/2 iotests: Update 186 after commit ac64273c66ab136c44043259162
In reply to Alberto Garcia--- tests/qemu-iotests/186.out | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/qemu-iotests/186.out +2 -2
@@ -404,7 +404,7 @@ Testing: -drive if=floppy QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block floppy0: [not inserted] - Attached to: /machine/unattached/device[17] + Attached to: /machine/unattached/device[13] Removable device: not locked, tray closed (qemu) quit
@@ -412,7 +412,7 @@ Testing: -drive if=floppy,driver=null-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block floppy0 (NODE_NAME): null-co:// (null-co) - Attached to: /machine/unattached/device[17] + Attached to: /machine/unattached/device[13] Removable device: not locked, tray closed Cache mode: writeback (qemu) quit
Signature · 1 line
2.11.0
Re: [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162
Quoted 11 lines · Alberto Garcia
Signed-off-by Alberto Garcia <[email protected]>Cc Philippe Mathieu-Daudé <[email protected]>--- tests/qemu-iotests/186.out | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tests/qemu-iotests/186.out +0
-0
tests/qemu-iotests/186.out Testing: -drive if=floppy · line 407
Quoted 5 lines
tests/qemu-iotests/186.out +1
-1@@ -404,7 +404,7 @@ Testing: -drive if=floppy QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block floppy0: [not inserted] - Attached to: /machine/unattached/device[17] + Attached to: /machine/unattached/device[13]
It looks like this name is quite flexible; would it not be better to enhance 186 to sed out the name (s/Attached to:.*/Attached to: PATH/) and then adjust the .out so that it is no longer sensitive to these types of internal renames?
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162
Quoted 5 lines · Eric Blake
Quoted 5 lines
tests/qemu-iotests/186.out +0
-0@@ -404,7 +404,7 @@ Testing: -drive if=floppy QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block
Quoted 8 lines
tests/qemu-iotests/186.out Testing: -drive if=floppy · line 407
Quoted 3 lines
tests/qemu-iotests/186.out +1
-1floppy0: [not inserted] - Attached to: /machine/unattached/device[17] + Attached to: /machine/unattached/device[13]It looks like this name is quite flexible; would it not be better to enhance 186 to sed out the name (s/Attached to:.*/Attached to: PATH/) and then adjust the .out so that it is no longer sensitive to these types of internal renames?
That's a good idea, shall we hide the number only? (i.e. leave "/machine/unattached/device[INDEX]" or something like that), or can the rest of the path also change?
Berto
Re: [Qemu-devel] [PATCH for-2.12 v3 2/2] iotests: Update 186 after commit ac64273c66ab136c44043259162
Quoted 15 lines · Alberto Garcia
Quoted 5 lines · Eric Blake
Quoted 5 lines
tests/qemu-iotests/186.out +0
-0@@ -404,7 +404,7 @@ Testing: -drive if=floppy QEMU X.Y.Z monitor - type 'help' for more information (qemu) info blockQuoted 8 lines
tests/qemu-iotests/186.out Testing: -drive if=floppy · line 407
Quoted 3 lines
tests/qemu-iotests/186.out +1
-1floppy0: [not inserted] - Attached to: /machine/unattached/device[17] + Attached to: /machine/unattached/device[13]It looks like this name is quite flexible; would it not be better to enhance 186 to sed out the name (s/Attached to:.*/Attached to: PATH/) and then adjust the .out so that it is no longer sensitive to these types of internal renames?
Quoted 3 lines
That's a good idea, shall we hide the number only? (i.e. leave "/machine/unattached/device[INDEX]" or something like that), or can the rest of the path also change?
I don't see the value in knowing whether the device is unattached, or if a future attaches it somewhere, so changing the entire thing to PATH seems reasonable, rather than trying to just focus on the index. (That is, the sed expression I mentioned is sufficient)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org