Update output of some iotests

PATCH Applied Alberto Garcia 2 participants 4 messages Mar 22, 2018 – Apr 3, 2018

lore

Share & tools

lore

Alberto Garcia

author

2018-03-22 14:47 UTC #0 lore raw

v4 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

v4: Filter 'Attached to:' lines [Eric]

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           |  6 +--
 tests/qemu-iotests/186.out       | 84 ++++++++++++++--------------------------
 tests/qemu-iotests/common.filter |  5 +++
 4 files changed, 34 insertions(+), 81 deletions(-)

Signature · 1 line

2.11.0

Alberto Garcia

author

2018-03-22 14:47 UTC #2 lore raw

PATCH v4 2/2 iotests: Update 186 after commit ac64273c66ab136c44043259162

Commit ac64273c66ab136c44 modified the output of iotest 186, changing the QOM path of floppy drives from /machine/unattached/device[17] to /machine/unattached/device[13].

Instead of updating the test output to reflect this change, this patch adds a new filter that hides all QOM paths from the 'Attached to:' line of the 'info block' command.

Signed-off-by Alberto Garcia <[email protected]>

Cc Philippe Mathieu-Daudé <[email protected]>

---
 tests/qemu-iotests/186           |  2 +-
 tests/qemu-iotests/186.out       | 56 ++++++++++++++++++++--------------------
 tests/qemu-iotests/common.filter |  5 ++++
 3 files changed, 34 insertions(+), 29 deletions(-)

tests/qemu-iotests/186 +1 -1

index 9687243d34..0aa4395a57 100755
@@ -64,7 +64,7 @@ function check_info_block()
 {
     echo "info block" |
     do_run_qemu "$@" | _filter_win32 | _filter_hmp | _filter_qemu |
-        _filter_generated_node_ids
+        _filter_generated_node_ids | _filter_qom_path
 }

tests/qemu-iotests/186.out +28 ~~-28~~

224 lines not on this page · raw message

tests/qemu-iotests/common.filter +5 -0

index cb2be23340..c5f4bcf578 100644
@@ -32,6 +32,11 @@ _filter_generated_node_ids()
      sed -re 's/\#block[0-9]{3,}/NODE_NAME/'
 }
 
+_filter_qom_path()
+{
+    sed -e 's#\(Attached to: *\) /.*#\1 PATH#'
+}
+
 # replace occurrences of the actual TEST_DIR value with TEST_DIR
 _filter_testdir()
 {

Signature · 1 line

2.11.0

Alberto Garcia

author

2018-03-22 14:47 UTC #1 lore raw

PATCH v4 1/2 iotests: Update 051 and 186 after commit 1454509726719e0933c

In reply to Alberto Garcia

SCSI controllers are no longer created automatically for -drive if=scsi, so this patch updates the tests that relied on that.

Signed-off-by Alberto Garcia <[email protected]>

Reviewed-by Eric Blake <[email protected]>

Cc Thomas Huth <[email protected]>

---
 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~~

index 830c11880a..b01f9a90d7 100644
@@ -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

index 44cc01ed87..9687243d34 100755
@@ -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~~

index c8377fe146..ec75c0fc60 100644
@@ -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

Kevin Wolf

Applied

2018-04-03 15:02 UTC #3 lore raw

In reply to Alberto Garcia

Am 22.03.2018 um 15:45 hat Alberto Garcia geschrieben:

Quoted 4 lines

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.

[ Cc: qemu-block ]

Thanks, applied to the block branch.

Kevin