[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 5/7] tests: add output filter to python I/O tests
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v5 5/7] tests: add output filter to python I/O tests helper |
Date: |
Thu, 17 Mar 2016 17:51:40 +0000 |
Add a 'log' method to iotests.py which prints messages to
stdout, with optional filtering of data. Port over some
standard filters already present in the shell common.filter
code to be usable in python too.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
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
- [Qemu-devel] [PATCH v5 0/7] Add new LUKS block driver (for 2.6), Daniel P. Berrange, 2016/03/17
- [Qemu-devel] [PATCH v5 2/7] qemu-img/qemu-io: don't prompt for passwords if not required, Daniel P. Berrange, 2016/03/17
- [Qemu-devel] [PATCH v5 3/7] tests: redirect stderr to stdout for iotests, Daniel P. Berrange, 2016/03/17
- [Qemu-devel] [PATCH v5 4/7] tests: refactor python I/O tests helper main method, Daniel P. Berrange, 2016/03/17
- [Qemu-devel] [PATCH v5 5/7] tests: add output filter to python I/O tests helper,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v5 1/7] block: add flag to indicate that no I/O will be performed, Daniel P. Berrange, 2016/03/17
- [Qemu-devel] [PATCH v5 7/7] block: drop support for using qcow[2] encryption with system emulators, Daniel P. Berrange, 2016/03/17
- [Qemu-devel] [PATCH v5 6/7] block: add generic full disk encryption driver, Daniel P. Berrange, 2016/03/17