| Message ID | 20180525163327.23097-8-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | block: Make blockdev-create a job and stable API | expand |
On 2018-05-25 18:33, Kevin Wolf wrote: > 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> > --- > 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: Wouldn't that be 'actual-size' (because I presume this is for JSON output)? > + continue > + line = line.replace(filename, 'TEST_DIR/t.IMGFMT') \ Why not just 'TEST_IMG'? Max > + .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) >
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)
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> --- tests/qemu-iotests/iotests.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)