[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 07/14] qemu-iotests: Add iotests.img_info_log()
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH 07/14] qemu-iotests: Add iotests.img_info_log() |
Date: |
Fri, 25 May 2018 18:33:20 +0200 |
This adds a filter function to postprocess 'qemu-img info' input
(similar to what _img_info does), and an img_info_log() function that
calls 'qemu-img info' and logs the filtered output.
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/iotests.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 319d898172..20ce5a0cf0 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -109,6 +109,10 @@ def qemu_img_pipe(*args):
sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, '
'.join(qemu_img_args + list(args))))
return subp.communicate()[0]
+def img_info_log(filename):
+ output = qemu_img_pipe('info', '-f', imgfmt, filename)
+ log(filter_img_info(output, filename))
+
def qemu_io(*args):
'''Run qemu-io and return the stdout data'''
args = qemu_io_args + list(args)
@@ -210,6 +214,18 @@ def filter_testfiles(msg):
prefix = os.path.join(test_dir, "%s-" % (os.getpid()))
return msg.replace(prefix, 'TEST_DIR/')
+def filter_img_info(output, filename):
+ lines = []
+ for line in output.split('\n'):
+ if 'disk size' in line or 'actual size' in line:
+ continue
+ line = line.replace(filename, 'TEST_DIR/t.IMGFMT') \
+ .replace(imgfmt, 'IMGFMT')
+ line = re.sub('iters: [0-9]+', 'iters: XXX', line)
+ line = re.sub('uuid: [-a-f0-9]+', 'uuid:
XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', line)
+ lines.append(line)
+ return '\n'.join(lines)
+
def log(msg, filters=[]):
for flt in filters:
msg = flt(msg)
--
2.13.6
- Re: [Qemu-block] [PATCH 04/14] block/create: Make x-blockdev-create a job, (continued)
Re: [Qemu-block] [PATCH 06/14] qemu-iotests: Add VM.qmp_log(), Jeff Cody, 2018/05/29
[Qemu-block] [PATCH 07/14] qemu-iotests: Add iotests.img_info_log(),
Kevin Wolf <=
[Qemu-block] [PATCH 09/14] qemu-iotests: Rewrite 207 for blockdev-create job, Kevin Wolf, 2018/05/25
[Qemu-block] [PATCH 10/14] qemu-iotests: Rewrite 210 for blockdev-create job, Kevin Wolf, 2018/05/25
[Qemu-block] [PATCH 08/14] qemu-iotests: Rewrite 206 for blockdev-create job, Kevin Wolf, 2018/05/25