Re: [Qemu-devel] [PATCH v4 18/26] tests: add output filter to python I/O tests helper

[Daniel P. Berrange]

On Mon, Mar 14, 2016 at 11:57:11AM -0600, Eric Blake wrote:
> On 02/29/2016 05:00 AM, Daniel P. Berrange wrote:
> > Add a 'log' method to iotests.py which prints messages to
> > stdout, with optional filtering of data. Port over some
> > standard filters for present in the shell common.filter
> > code.
> 
> I'm not sure what you meant by 'for present'.

Nor am I :-)

Perhaps I meant to say 'already present'

> > 
> > Signed-off-by: Daniel P. Berrange 
> > ---
> >  tests/qemu-iotests/iotests.py | 25 -
> >  1 file changed, 24 insertions(+), 1 deletion(-)
> > 
> 
> But the patch itself looks reasonable.
> Reviewed-by: Eric Blake 
> 
> -- 
> Eric Blake   eblake redhat com+1-919-301-3266
> Libvirt virtualization library http://libvirt.org
> 



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 :|

Re: [Qemu-devel] [PATCH v4 18/26] tests: add output filter to python I/O tests helper

[Eric Blake]

On 02/29/2016 05:00 AM, Daniel P. Berrange wrote:
> Add a 'log' method to iotests.py which prints messages to
> stdout, with optional filtering of data. Port over some
> standard filters for present in the shell common.filter
> code.

I'm not sure what you meant by 'for present'.

> 
> Signed-off-by: Daniel P. Berrange 
> ---
>  tests/qemu-iotests/iotests.py | 25 -
>  1 file changed, 24 insertions(+), 1 deletion(-)
> 

But the patch itself looks reasonable.
Reviewed-by: Eric Blake 

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature

[Qemu-devel] [PATCH v4 18/26] tests: add output filter to python I/O tests helper

[Daniel P. Berrange]

Add a 'log' method to iotests.py which prints messages to
stdout, with optional filtering of data. Port over some
standard filters for present in the shell common.filter
code.

Signed-off-by: Daniel P. Berrange 
---
 tests/qemu-iotests/iotests.py | 25 -
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 51e53bb..8499e1b 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -30,7 +30,8 @@ import struct
 
 __all__ = ['imgfmt', 'imgproto', 'test_dir' 'qemu_img', 'qemu_io',
'VM', 'QMPTestCase', 'notrun', 'main', 'verify_image_format',
-   'verify_platform']
+   'verify_platform', 'filter_test_dir', 'filter_win32',
+   'filter_qemu_io', 'filter_chown', 'log']
 
 # This will not work if arguments contain spaces but is necessary if we
 # want to support the override options that ./check supports.
@@ -105,6 +106,28 @@ def create_image(name, size):
 i = i + 512
 file.close()
 
+test_dir_re = re.compile(r"%s" % test_dir)
+def filter_test_dir(msg):
+return test_dir_re.sub("TEST_DIR", msg)
+
+win32_re = re.compile(r"\r")
+def filter_win32(msg):
+return win32_re.sub("", msg)
+
+qemu_io_re = re.compile(r"[0-9]* ops; [0-9\/:. sec]* \([0-9\/.inf]* 
[EPTGMKiBbytes]*\/sec and [0-9\/.inf]* ops\/sec\)")
+def filter_qemu_io(msg):
+msg = filter_win32(msg)
+return qemu_io_re.sub("X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)", 
msg)
+
+chown_re = re.compile(r"chown [0-9]+:[0-9]+")
+def filter_chown(msg):
+return chown_re.sub("chown UID:GID", msg)
+
+def log(msg, filters=[]):
+for flt in filters:
+msg = flt(msg)
+print msg
+
 # Test if 'match' is a recursive subset of 'event'
 def event_match(event, match=None):
 if match is None:
-- 
2.5.0