Skip to content

Commit

Permalink
iotests: Fix 067 for compat=0.10
Browse files Browse the repository at this point in the history 
067 works very well with compat=0.10 once you remove format-specific
information from the QMP output.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20171123020832.8165-14-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
  • Loading branch information
@XanClic
XanClic committed Jan 23, 2018
1 parent 76bf133 commit e121034
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 72 deletions.
3 changes: 2 additions & 1 deletion tests/qemu-iotests/067
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ function run_qemu()
{
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \
| _filter_actual_image_size \
| _filter_generated_node_ids | _filter_qmp_events
| _filter_generated_node_ids | _filter_qmp_events \
| _filter_img_info
}

size=128M
Expand Down
97 changes: 26 additions & 71 deletions tests/qemu-iotests/067.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728

=== -drive/-device and device_del ===

Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virtio-blk,drive=disk,id=virtio0
Testing: -drive file=TEST_DIR/t.IMGFMT,format=IMGFMT,if=none,id=disk -device virtio-blk,drive=disk,id=virtio0
{
QMP_VERSION
}
Expand All @@ -23,26 +23,17 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti
"detect_zeroes": "off",
"image": {
"virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2",
"filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536,
"format": "qcow2",
"format": "IMGFMT",
"actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false
},
"iops_wr": 0,
"ro": false,
"node-name": "NODE_NAME",
"backing_file_depth": 0,
"drv": "qcow2",
"drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
Expand All @@ -54,7 +45,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.qcow2",
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
},
"qdev": "/machine/peripheral/virtio0/virtio-backend",
Expand All @@ -81,7 +72,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti

=== -drive/device_add and device_del ===

Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
Testing: -drive file=TEST_DIR/t.IMGFMT,format=IMGFMT,if=none,id=disk
{
QMP_VERSION
}
Expand All @@ -100,26 +91,17 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
"detect_zeroes": "off",
"image": {
"virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2",
"filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536,
"format": "qcow2",
"format": "IMGFMT",
"actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false
},
"iops_wr": 0,
"ro": false,
"node-name": "NODE_NAME",
"backing_file_depth": 0,
"drv": "qcow2",
"drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
Expand All @@ -131,7 +113,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.qcow2",
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
},
"type": "unknown"
Expand Down Expand Up @@ -183,26 +165,17 @@ Testing:
"detect_zeroes": "off",
"image": {
"virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2",
"filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536,
"format": "qcow2",
"format": "IMGFMT",
"actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false
},
"iops_wr": 0,
"ro": false,
"node-name": "NODE_NAME",
"backing_file_depth": 0,
"drv": "qcow2",
"drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
Expand All @@ -214,7 +187,7 @@ Testing:
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.qcow2",
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
},
"type": "unknown"
Expand Down Expand Up @@ -263,26 +236,17 @@ Testing:
"detect_zeroes": "off",
"image": {
"virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2",
"filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536,
"format": "qcow2",
"format": "IMGFMT",
"actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false
},
"iops_wr": 0,
"ro": false,
"node-name": "disk",
"backing_file_depth": 0,
"drv": "qcow2",
"drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
Expand All @@ -294,15 +258,15 @@ Testing:
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.qcow2",
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
},
{
"iops_rd": 0,
"detect_zeroes": "off",
"image": {
"virtual-size": 197120,
"filename": "TEST_DIR/t.qcow2",
"filename": "TEST_DIR/t.IMGFMT",
"format": "file",
"actual-size": SIZE,
"dirty-flag": false
Expand All @@ -323,7 +287,7 @@ Testing:
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.qcow2",
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
}
]
Expand All @@ -347,26 +311,17 @@ Testing:
"detect_zeroes": "off",
"image": {
"virtual-size": 134217728,
"filename": "TEST_DIR/t.qcow2",
"filename": "TEST_DIR/t.IMGFMT",
"cluster-size": 65536,
"format": "qcow2",
"format": "IMGFMT",
"actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"dirty-flag": false
},
"iops_wr": 0,
"ro": false,
"node-name": "disk",
"backing_file_depth": 0,
"drv": "qcow2",
"drv": "IMGFMT",
"iops": 0,
"bps_wr": 0,
"write_threshold": 0,
Expand All @@ -378,15 +333,15 @@ Testing:
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.qcow2",
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
},
{
"iops_rd": 0,
"detect_zeroes": "off",
"image": {
"virtual-size": 197120,
"filename": "TEST_DIR/t.qcow2",
"filename": "TEST_DIR/t.IMGFMT",
"format": "file",
"actual-size": SIZE,
"dirty-flag": false
Expand All @@ -407,7 +362,7 @@ Testing:
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.qcow2",
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
}
]
Expand Down

0 comments on commit e121034

Please sign in to comment.