yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From 9bc557fe1998a5e7f77fe3f39ceaf09690b3b7dc Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Tue, 26 Jun 2018 09:48:43 +0200
26ba25
Subject: [PATCH 135/268] qemu-iotests: Add iotests.img_info_log()
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20180626094856.6924-61-kwolf@redhat.com>
26ba25
Patchwork-id: 81082
26ba25
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 60/73] qemu-iotests: Add iotests.img_info_log()
26ba25
Bugzilla: 1513543
26ba25
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: Fam Zheng <famz@redhat.com>
26ba25
26ba25
This adds a filter function to postprocess 'qemu-img info' input
26ba25
(similar to what _img_info does), and an img_info_log() function that
26ba25
calls 'qemu-img info' and logs the filtered output.
26ba25
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Reviewed-by: Max Reitz <mreitz@redhat.com>
26ba25
Reviewed-by: Jeff Cody <jcody@redhat.com>
26ba25
(cherry picked from commit 6b605adec4d7491488d9cfb50bc256e667d8caf1)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 tests/qemu-iotests/iotests.py | 18 ++++++++++++++++++
26ba25
 1 file changed, 18 insertions(+)
26ba25
26ba25
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
26ba25
index e3de6b0..db4206f 100644
26ba25
--- a/tests/qemu-iotests/iotests.py
26ba25
+++ b/tests/qemu-iotests/iotests.py
26ba25
@@ -110,6 +110,12 @@ def qemu_img_pipe(*args):
26ba25
         sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
26ba25
     return subp.communicate()[0]
26ba25
 
26ba25
+def img_info_log(filename, filter_path=None):
26ba25
+    output = qemu_img_pipe('info', '-f', imgfmt, filename)
26ba25
+    if not filter_path:
26ba25
+        filter_path = filename
26ba25
+    log(filter_img_info(output, filter_path))
26ba25
+
26ba25
 def qemu_io(*args):
26ba25
     '''Run qemu-io and return the stdout data'''
26ba25
     args = qemu_io_args + list(args)
26ba25
@@ -220,6 +226,18 @@ def filter_testfiles(msg):
26ba25
     prefix = os.path.join(test_dir, "%s-" % (os.getpid()))
26ba25
     return msg.replace(prefix, 'TEST_DIR/PID-')
26ba25
 
26ba25
+def filter_img_info(output, filename):
26ba25
+    lines = []
26ba25
+    for line in output.split('\n'):
26ba25
+        if 'disk size' in line or 'actual-size' in line:
26ba25
+            continue
26ba25
+        line = line.replace(filename, 'TEST_IMG') \
26ba25
+                   .replace(imgfmt, 'IMGFMT')
26ba25
+        line = re.sub('iters: [0-9]+', 'iters: XXX', line)
26ba25
+        line = re.sub('uuid: [-a-f0-9]+', 'uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', line)
26ba25
+        lines.append(line)
26ba25
+    return '\n'.join(lines)
26ba25
+
26ba25
 def log(msg, filters=[]):
26ba25
     for flt in filters:
26ba25
         msg = flt(msg)
26ba25
-- 
26ba25
1.8.3.1
26ba25