From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43747)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1fNsg7-0007Pj-MK
	for qemu-devel@nongnu.org; Wed, 30 May 2018 00:25:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1fNsg6-00025z-PF
	for qemu-devel@nongnu.org; Wed, 30 May 2018 00:25:39 -0400
Date: Wed, 30 May 2018 00:25:29 -0400
From: Jeff Cody <jcody@redhat.com>
Message-ID: <20180530042529.GE9904@localhost.localdomain>
References: <20180529203910.7615-1-kwolf@redhat.com>
	<20180529203910.7615-8-kwolf@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20180529203910.7615-8-kwolf@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v2 07/16] qemu-iotests: Add
 iotests.img_info_log()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Kevin Wolf <kwolf@redhat.com>
Cc: qemu-block@nongnu.org, mreitz@redhat.com, jsnow@redhat.com, eblake@redhat.com, pkrempa@redhat.com, qemu-devel@nongnu.org

On Tue, May 29, 2018 at 10:39:01PM +0200, 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>

Reviewed-by: Jeff Cody <jcody@redhat.com>

> ---
>  tests/qemu-iotests/iotests.py | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 2f54823db6..edcd2bb701 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -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)
> -- 
> 2.13.6
>