On Wed, 01/15 08:01, Peter Lieven wrote:
> On 15.01.2014 07:54, Fam Zheng wrote:
> >On Mon, 01/13 11:21, Peter Lieven wrote:
> >>Signed-off-by: Peter Lieven <p...@kamp.de>
> >>---
> >> tests/qemu-iotests/067.out | 8 ++++----
> >> 1 file changed, 4 insertions(+), 4 deletions(-)
> >>
> >>diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out
> >>index 8d271cc..79ed90f 100644
> >>--- a/tests/qemu-iotests/067.out
> >>+++ b/tests/qemu-iotests/067.out
> >>@@ -12,7 +12,7 @@ QMP_VERSION
> >> {"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"}]}
> >>+{"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": {}}
> >> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> >> "event": "SHUTDOWN"}
> >> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> >> "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open":
> >> true}}
> >>@@ -31,7 +31,7 @@ QMP_VERSION
> >> {"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"}]}
> >>+{"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": {}}
> >> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> >> "event": "SHUTDOWN"}
> >> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> >> "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open":
> >> true}}
> >>@@ -51,7 +51,7 @@ QMP_VERSION
> >> {"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"}]}
> >>+{"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": 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"}]}
> >> {"return": {}}
> >> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> >> "event": "SHUTDOWN"}
> >> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> >> "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open":
> >> true}}
> >>@@ -71,7 +71,7 @@ QMP_VERSION
> >> {"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": 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": [{"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": 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"}]}
> >> {"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.7.9.5
> >>
> >Didn't look closely, but this still fails for me with your series applied:
> >
> >QEMU -- ../../x86_64-softmmu/qemu-system-x86_64
> >QEMU_IMG -- ../../qemu-img
> >QEMU_IO -- ../../qemu-io
> >QEMU_NBD -- ../../qemu-nbd
> >IMGFMT -- qcow2 (compat=1.1)
> >IMGPROTO -- file
> >PLATFORM -- Linux/x86_64 T430 3.12.7-2-ARCH
> >SOCKET_SCM_HELPER --
> >
> >067 - output mismatch (see 067.out.bad)
> >--- 067.out 2014-01-15 14:28:00.827531423 +0800
> >+++ 067.out.bad 2014-01-15 14:53:02.564180828 +0800
> >@@ -12,7 +12,7 @@
> > {"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": "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": [{"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": {}}
> > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> > "event": "SHUTDOWN"}
> > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> > "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open":
> > true}}
> >@@ -31,7 +31,7 @@
> > {"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": "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": [{"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": {}}
> > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> > "event": "SHUTDOWN"}
> > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> > "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open":
> > true}}
> >@@ -51,7 +51,7 @@
> > {"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": 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"}]}
> >+{"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"}]}
> > {"return": {}}
> > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> > "event": "SHUTDOWN"}
> > {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP},
> > "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open":
> > true}}
> >@@ -71,7 +71,7 @@
> > {"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": 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"}]}
> >+{"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}}
> >Failures: 067
> >Failed 1 of 1 tests
> >
> It seems the output was changed again without adjusting this patch. Maybe
> this patch should be adjusted to filter out the fields that we are interested
> in.
>
Max, any thoughts about making this test less fragile?
Fam
