Re: [Qemu-devel] [PATCH] block: filter filename when testing encrypted images

[Daniel P. Berrange]

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 <address@hidden>
> > ---
> >  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
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|