| Message ID | 1432122314-17287-1-git-send-email-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 05/20/2015 05:45 AM, Daniel P. Berrange wrote: > qemu-io prints a warning message > > "Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted." > > when opening an encrypted image, which was mistakenly included > in the expected output for test 131. Add a filter which strips > this filename from the output data. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > tests/qemu-iotests/131.out | 4 ---- > tests/qemu-iotests/common.filter | 3 ++- > 2 files changed, 2 insertions(+), 5 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
Am 20.05.2015 um 13:45 hat Daniel P. Berrange geschrieben: > qemu-io prints a warning message > > "Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted." > > when opening an encrypted image, which was mistakenly included > in the expected output for test 131. Add a filter which strips > this filename from the output data. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > tests/qemu-iotests/131.out | 4 ---- > tests/qemu-iotests/common.filter | 3 ++- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out > index 4eedb35..7141e4f 100644 > --- a/tests/qemu-iotests/131.out > +++ b/tests/qemu-iotests/131.out > @@ -11,7 +11,6 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on > Encrypted images are deprecated > Support for them will be removed in a future release. > You can use 'qemu-img convert' to convert your image to an unencrypted one. > -Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted. > password: > read 134217728/134217728 bytes at offset 0 > 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Usually we just apply _filter_testdir(), which leaves the message around, but replaces the variable part with "TEST_DIR". I think that would be better here, too, because it shows that qemu-io did indeed recognise the image as encrypted. If you send a v2, I'll squash that into the original, buggy commit before sending a pull request. Kevin
On Wed, May 20, 2015 at 05:05:51PM +0200, Kevin Wolf wrote: > Am 20.05.2015 um 13:45 hat Daniel P. Berrange geschrieben: > > qemu-io prints a warning message > > > > "Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted." > > > > when opening an encrypted image, which was mistakenly included > > in the expected output for test 131. Add a filter which strips > > this filename from the output data. > > > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > > --- > > tests/qemu-iotests/131.out | 4 ---- > > tests/qemu-iotests/common.filter | 3 ++- > > 2 files changed, 2 insertions(+), 5 deletions(-) > > > > diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out > > index 4eedb35..7141e4f 100644 > > --- a/tests/qemu-iotests/131.out > > +++ b/tests/qemu-iotests/131.out > > @@ -11,7 +11,6 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on > > Encrypted images are deprecated > > Support for them will be removed in a future release. > > You can use 'qemu-img convert' to convert your image to an unencrypted one. > > -Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted. > > password: > > read 134217728/134217728 bytes at offset 0 > > 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > Usually we just apply _filter_testdir(), which leaves the message > around, but replaces the variable part with "TEST_DIR". I think that > would be better here, too, because it shows that qemu-io did indeed > recognise the image as encrypted. > > If you send a v2, I'll squash that into the original, buggy commit > before sending a pull request. Ok, will change that. Regards, Daniel
diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out index 4eedb35..7141e4f 100644 --- a/tests/qemu-iotests/131.out +++ b/tests/qemu-iotests/131.out @@ -11,7 +11,6 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on Encrypted images are deprecated Support for them will be removed in a future release. You can use 'qemu-img convert' to convert your image to an unencrypted one. -Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted. password: read 134217728/134217728 bytes at offset 0 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -20,7 +19,6 @@ read 134217728/134217728 bytes at offset 0 Encrypted images are deprecated Support for them will be removed in a future release. You can use 'qemu-img convert' to convert your image to an unencrypted one. -Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted. password: wrote 134217728/134217728 bytes at offset 0 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -29,7 +27,6 @@ wrote 134217728/134217728 bytes at offset 0 Encrypted images are deprecated Support for them will be removed in a future release. You can use 'qemu-img convert' to convert your image to an unencrypted one. -Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted. password: read 134217728/134217728 bytes at offset 0 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -38,7 +35,6 @@ read 134217728/134217728 bytes at offset 0 Encrypted images are deprecated Support for them will be removed in a future release. You can use 'qemu-img convert' to convert your image to an unencrypted one. -Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted. password: Pattern verification failed at offset 0, 134217728 bytes read 134217728/134217728 bytes at offset 0 diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 012a812..6ebef4c 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -151,7 +151,8 @@ _filter_qemu_io() { _filter_win32 | sed -e "s/[0-9]* ops\; [0-9/:. sec]* ([0-9/.inf]* [EPTGMKiBbytes]*\/sec and [0-9/.inf]* ops\/sec)/X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" \ -e "s/: line [0-9][0-9]*: *[0-9][0-9]*\( Aborted\| Killed\)/:\1/" \ - -e "s/qemu-io> //g" + -e "s/qemu-io> //g" \ + -e "/Disk image '.*' is encrypted\./d" } # replace occurrences of QEMU_PROG with "qemu"
qemu-io prints a warning message "Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted." when opening an encrypted image, which was mistakenly included in the expected output for test 131. Add a filter which strips this filename from the output data. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- tests/qemu-iotests/131.out | 4 ---- tests/qemu-iotests/common.filter | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-)