Le Saturday 02 Nov 2013 à 14:52:11 (+0100), Max Reitz a écrit :
> The actual size of the image file may differ depending on the Linux
> kernel currently running on the host. Filtering out this value makes
> this test pass in such cases.
>
> Signed-off-by: Max Reitz <mre...@redhat.com>
> ---
> tests/qemu-iotests/067 | 2 +-
> tests/qemu-iotests/067.out | 10 +++++-----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
> index 79dc38b..d025192 100755
> --- a/tests/qemu-iotests/067
> +++ b/tests/qemu-iotests/067
> @@ -45,7 +45,7 @@ function do_run_qemu()
>
> function run_qemu()
> {
> - do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp
> + do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | sed -e
> 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g'
> }
>
> size=128M
> diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out
> index 4bb9ff9..8d271cc 100644
> --- a/tests/qemu-iotests/067.out
> +++ b/tests/qemu-iotests/067.out
> @@ -6,7 +6,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device
> virtio-blk-pci,drive=disk,id=virtio0
> QMP_VERSION
> {"return": {}}
> -{"return": [{"io-status": "ok", "device": "disk", "locked": false,
> "removable": false, "inserted": {"iops_rd": 0, "image": {"virtual-size":
> 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format":
> "qcow2", "actual-size": 139264, "format-specific": {"type": "qcow2", "data":
> {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr":
> 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
> 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
> "encryption_key_missing": false}, "type": "unknown"}, {"io-status": "ok",
> "device": "ide1-cd0", "locked": false, "removable": true, "tray_open": false,
> "type": "unknown"}, {"device": "floppy0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"device": "sd0", "locked": false,
> "removable": true, "tray_open": false, "type": "unknown"}]}
> +{"return": [{"io-status": "ok", "device": "disk", "locked": false,
> "removable": false, "inserted": {"iops_rd": 0, "image": {"virtual-size":
> 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format":
> "qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data":
> {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr":
> 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
> 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
> "encryption_key_missing": false}, "type": "unknown"}, {"io-status": "ok",
> "device": "ide1-cd0", "locked": false, "removable": true, "tray_open": false,
> "type": "unknown"}, {"device": "floppy0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"device": "sd0", "locked": false,
> "removable": true, "tray_open": false, "type": "unknown"}]}
> {"return": {}}
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "DEVICE_DELETED", "data": {"path":
> "/machine/peripheral/virtio0/virtio-backend"}}
> @@ -24,7 +24,7 @@ QMP_VERSION
> Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
> QMP_VERSION
> {"return": {}}
> -{"return": [{"device": "disk", "locked": false, "removable": true,
> "inserted": {"iops_rd": 0, "image": {"virtual-size": 134217728, "filename":
> "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2", "actual-size":
> 139264, "format-specific": {"type": "qcow2", "data": {"compat": "1.1",
> "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false,
> "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "encrypted":
> false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
> "encryption_key_missing": false}, "tray_open": false, "type": "unknown"},
> {"io-status": "ok", "device": "ide1-cd0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"device": "floppy0", "locked":
> false, "removable": true, "tray_open": false, "type": "unknown"}, {"device":
> "sd0", "locked": false, "removable": true, "tray_open": false, "type":
> "unknown"}]}
> +{"return": [{"device": "disk", "locked": false, "removable": true,
> "inserted": {"iops_rd": 0, "image": {"virtual-size": 134217728, "filename":
> "TEST_DIR/t.qcow2", "cluster-size": 65536, "format": "qcow2", "actual-size":
> SIZE, "format-specific": {"type": "qcow2", "data": {"compat": "1.1",
> "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr": 0, "ro": false,
> "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr": 0, "encrypted":
> false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
> "encryption_key_missing": false}, "tray_open": false, "type": "unknown"},
> {"io-status": "ok", "device": "ide1-cd0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"device": "floppy0", "locked":
> false, "removable": true, "tray_open": false, "type": "unknown"}, {"device":
> "sd0", "locked": false, "removable": true, "tray_open": false, "type":
> "unknown"}]}
> {"return": {}}
> {"return": {}}
> {"return": {}}
> @@ -44,7 +44,7 @@ Testing:
> QMP_VERSION
> {"return": {}}
> {"return": "OK\r\n"}
> -{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
> "removable": true, "tray_open": false, "type": "unknown"}, {"device":
> "floppy0", "locked": false, "removable": true, "tray_open": false, "type":
> "unknown"}, {"device": "sd0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"device": "disk", "locked": false,
> "removable": true, "inserted": {"iops_rd": 0, "image": {"virtual-size":
> 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format":
> "qcow2", "actual-size": 139264, "format-specific": {"type": "qcow2", "data":
> {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr":
> 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
> 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
> "encryption_key_missing": false}, "tray_open": false, "type": "unknown"}]}
> +{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
> "removable": true, "tray_open": false, "type": "unknown"}, {"device":
> "floppy0", "locked": false, "removable": true, "tray_open": false, "type":
> "unknown"}, {"device": "sd0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"device": "disk", "locked": false,
> "removable": true, "inserted": {"iops_rd": 0, "image": {"virtual-size":
> 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format":
> "qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data":
> {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr":
> 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
> 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
> "encryption_key_missing": false}, "tray_open": false, "type": "unknown"}]}
> {"return": {}}
> {"return": {}}
> {"return": {}}
> @@ -64,14 +64,14 @@ Testing:
> QMP_VERSION
> {"return": {}}
> {"return": {}}
> -{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
> "removable": true, "tray_open": false, "type": "unknown"}, {"device":
> "floppy0", "locked": false, "removable": true, "tray_open": false, "type":
> "unknown"}, {"device": "sd0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"device": "disk", "locked": false,
> "removable": true, "inserted": {"iops_rd": 0, "image": {"virtual-size":
> 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format":
> "qcow2", "actual-size": 139264, "format-specific": {"type": "qcow2", "data":
> {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr":
> 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
> 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
> "encryption_key_missing": false}, "tray_open": false, "type": "unknown"}]}
> +{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
> "removable": true, "tray_open": false, "type": "unknown"}, {"device":
> "floppy0", "locked": false, "removable": true, "tray_open": false, "type":
> "unknown"}, {"device": "sd0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"device": "disk", "locked": false,
> "removable": true, "inserted": {"iops_rd": 0, "image": {"virtual-size":
> 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size": 65536, "format":
> "qcow2", "actual-size": SIZE, "format-specific": {"type": "qcow2", "data":
> {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag": false}, "iops_wr":
> 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2", "iops": 0, "bps_wr":
> 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file": "TEST_DIR/t.qcow2",
> "encryption_key_missing": false}, "tray_open": false, "type": "unknown"}]}
> {"return": {}}
> {"return": {}}
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "DEVICE_DELETED", "data": {"path":
> "/machine/peripheral/virtio0/virtio-backend"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "DEVICE_DELETED", "data": {"device": "virtio0", "path":
> "/machine/peripheral/virtio0"}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "RESET"}
> -{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
> "removable": true, "tray_open": false, "type": "unknown"}, {"device":
> "floppy0", "locked": false, "removable": true, "tray_open": false, "type":
> "unknown"}, {"device": "sd0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"io-status": "ok", "device": "disk",
> "locked": false, "removable": true, "inserted": {"iops_rd": 0, "image":
> {"virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size":
> 65536, "format": "qcow2", "actual-size": 139264, "format-specific": {"type":
> "qcow2", "data": {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag":
> false}, "iops_wr": 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2",
> "iops": 0, "bps_wr": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file":
> "TEST_DIR/t.qcow2", "encryption_key_missing": false}, "tray_open": false,
> "type": "unknown"}]}
> +{"return": [{"io-status": "ok", "device": "ide1-cd0", "locked": false,
> "removable": true, "tray_open": false, "type": "unknown"}, {"device":
> "floppy0", "locked": false, "removable": true, "tray_open": false, "type":
> "unknown"}, {"device": "sd0", "locked": false, "removable": true,
> "tray_open": false, "type": "unknown"}, {"io-status": "ok", "device": "disk",
> "locked": false, "removable": true, "inserted": {"iops_rd": 0, "image":
> {"virtual-size": 134217728, "filename": "TEST_DIR/t.qcow2", "cluster-size":
> 65536, "format": "qcow2", "actual-size": SIZE, "format-specific": {"type":
> "qcow2", "data": {"compat": "1.1", "lazy-refcounts": false}}, "dirty-flag":
> false}, "iops_wr": 0, "ro": false, "backing_file_depth": 0, "drv": "qcow2",
> "iops": 0, "bps_wr": 0, "encrypted": false, "bps": 0, "bps_rd": 0, "file":
> "TEST_DIR/t.qcow2", "encryption_key_missing": false}, "tray_open": false,
> "type": "unknown"}]}
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "SHUTDOWN"}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
> --
> 1.8.4.1
>
>
Reviewed-by: Benoit Canet <ben...@irqsave.net>
