mirror of
https://github.com/xemu-project/xemu.git
synced 2024-12-02 00:26:18 +00:00
qemu-iotests: Add iotests.img_info_log()
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 <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
parent
e234398a8e
commit
6b605adec4
@ -109,6 +109,12 @@ 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, filter_path=None):
|
||||
output = qemu_img_pipe('info', '-f', imgfmt, filename)
|
||||
if not filter_path:
|
||||
filter_path = filename
|
||||
log(filter_img_info(output, filter_path))
|
||||
|
||||
def qemu_io(*args):
|
||||
'''Run qemu-io and return the stdout data'''
|
||||
args = qemu_io_args + list(args)
|
||||
@ -210,6 +216,18 @@ def filter_testfiles(msg):
|
||||
prefix = os.path.join(test_dir, "%s-" % (os.getpid()))
|
||||
return msg.replace(prefix, 'TEST_DIR/PID-')
|
||||
|
||||
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_IMG') \
|
||||
.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)
|
||||
|
Loading…
Reference in New Issue
Block a user