Re: [Qemu-block] [PATCH] qemu-iotests: Make test 192 use QMP; convert it to Python
On Tue, Sep 05, 2017 at 02:37:21PM -0500, Eric Blake wrote:
> On 09/04/2017 08:28 AM, Kashyap Chamarthy wrote:
> > On Mon, Sep 04, 2017 at 08:55:23PM +0800, Fam Zheng wrote:
> >> Hi Kashyap,
> >>
> >> On Mon, 09/04 13:16, Kashyap Chamarthy wrote:
>
> >>> The test 192 ("Test NBD export with '-incoming' (non-shared
> >>> storage migration use case from libvirt")) is currently using HMP.
> >>> Replace the HMP usage with QMP, as the upstream preference seems to be:
> >>> "Use QMP where possible, unless you're explicitly testing something
> >>> related to HMP".
>
> Kevin actually argued that keeping some HMP coverage is a GOOD thing:
>
> https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg00798.html
Yeah, noticed it after I sent my patch. I agree with Kevin's argument,
so I'll just simply drop my patch.
> >> As an improvement maybe you could rebase to Stefan's "iotests: clean up
> >> resources using context managers" series and switch to "with" for the temp
> >> file
> >> and VM.
> >
> > Good point. I did notice that thread[*] about resource clean up. And I
> > see it's already applied to 'block-next'. Will rebase and change to the
> > 'with' statement.
>
> I'm not sure if this patch helps us any; I personally find the unit-test
> style python iotests harder to debug than the ones that produce
> diff-able nnn.out files (debugging an nnn.out file that has only a list
> of . doesn't make it easy to reproduce). If the test already runs
> well in shell, what does the conversion to Python actually buy us?
While turning it to QMP, thought I'd convert it to Python as the test is
_very_ similar to 194 (also in Python).
Given Kevin's argument in the above thread you pointed out, just
disregard my patch.
--
/kashyap
Re: [Qemu-block] [PATCH] qemu-iotests: Make test 192 use QMP; convert it to Python
On 09/04/2017 08:28 AM, Kashyap Chamarthy wrote:
> On Mon, Sep 04, 2017 at 08:55:23PM +0800, Fam Zheng wrote:
>> Hi Kashyap,
>>
>> On Mon, 09/04 13:16, Kashyap Chamarthy wrote:
>>> The test 192 ("Test NBD export with '-incoming' (non-shared
>>> storage migration use case from libvirt")) is currently using HMP.
>>> Replace the HMP usage with QMP, as the upstream preference seems to be:
>>> "Use QMP where possible, unless you're explicitly testing something
>>> related to HMP".
Kevin actually argued that keeping some HMP coverage is a GOOD thing:
https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg00798.html
>>
>> As an improvement maybe you could rebase to Stefan's "iotests: clean up
>> resources using context managers" series and switch to "with" for the temp
>> file
>> and VM.
>
> Good point. I did notice that thread[*] about resource clean up. And I
> see it's already applied to 'block-next'. Will rebase and change to the
> 'with' statement.
I'm not sure if this patch helps us any; I personally find the unit-test
style python iotests harder to debug than the ones that produce
diff-able nnn.out files (debugging an nnn.out file that has only a list
of . doesn't make it easy to reproduce). If the test already runs
well in shell, what does the conversion to Python actually buy us?
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
Re: [Qemu-block] [PATCH] qemu-iotests: Make test 192 use QMP; convert it to Python
On Mon, Sep 04, 2017 at 08:55:23PM +0800, Fam Zheng wrote:
> Hi Kashyap,
>
> On Mon, 09/04 13:16, Kashyap Chamarthy wrote:
[...]
> > +dest_vm = (iotests.VM('dest').add_drive(test_img_path)
> > + .add_incoming('defer'))
>
> Superfluous parenthesis?
Yes, the paranthesis can be removed and turn it into a single line:
dest_vm = iotests.VM('dest').add_drive(test_img_path).add_incoming('defer')
> > +dest_vm.launch()
> > +atexit.register(dest_vm.shutdown)
>
> As an improvement maybe you could rebase to Stefan's "iotests: clean up
> resources using context managers" series and switch to "with" for the temp
> file
> and VM.
Good point. I did notice that thread[*] about resource clean up. And I
see it's already applied to 'block-next'. Will rebase and change to the
'with' statement.
[*] https://lists.nongnu.org/archive/html/qemu-devel/2017-08/msg04639.html
> Otherwise looks good to me.
Thanks for the quick review!
[...]
--
/kashyap
Re: [Qemu-block] [PATCH] qemu-iotests: Make test 192 use QMP; convert it to Python
Hi Kashyap,
On Mon, 09/04 13:16, Kashyap Chamarthy wrote:
> The test 192 ("Test NBD export with '-incoming' (non-shared
> storage migration use case from libvirt")) is currently using HMP.
> Replace the HMP usage with QMP, as the upstream preference seems to be:
> "Use QMP where possible, unless you're explicitly testing something
> related to HMP".
>
> While at it, convert the test from Bash to Python.
>
> Signed-off-by: Kashyap Chamarthy
> ---
> tests/qemu-iotests/192 | 78
> ++
> tests/qemu-iotests/192.out | 14 -
> 2 files changed, 38 insertions(+), 54 deletions(-)
>
> diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
> index
> b50a2c0c8e2fccdddfae4ac58ca35937c5f784c6..692475f0a8c80c81396587d3289d4b32c0ee0d21
> 100755
> --- a/tests/qemu-iotests/192
> +++ b/tests/qemu-iotests/192
> @@ -1,7 +1,4 @@
> -#!/bin/bash
> -#
> -# Test NBD export with -incoming (non-shared storage migration use case from
> -# libvirt)
> +#!/usr/bin/env python
> #
> # Copyright (C) 2017 Red Hat, Inc.
> #
> @@ -18,46 +15,33 @@
> # You should have received a copy of the GNU General Public License
> # along with this program. If not, see
> +# [Converted to Python from the original Bash version by Fam
> +# Zheng ( +#
> +# Purpose: Test NBD export with '-incoming' (non-shared storage
> +# migration use case from libvirt)
> +
> +import os
> +import atexit
> +import iotests
> +
> +iotests.verify_platform(['linux'])
> +
> +img_size = '1G'
> +test_img_path = os.path.join(iotests.test_dir, 'dest.img')
> +iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, test_img_path,
> img_size)
> +
> +iotests.log('Launching VM...')
> +nbd_sock_path = os.path.join(iotests.test_dir, 'nbd.sock')
> +dest_vm = (iotests.VM('dest').add_drive(test_img_path)
> + .add_incoming('defer'))
Superfluous parenthesis?
> +dest_vm.launch()
> +atexit.register(dest_vm.shutdown)
As an improvement maybe you could rebase to Stefan's "iotests: clean up
resources using context managers" series and switch to "with" for the temp file
and VM.
Otherwise looks good to me.
Fam
> +
> +iotests.log('Launching NBD server on destination...')
> +iotests.log(dest_vm.qmp('nbd-server-start', addr={'type': 'unix', 'data':
> {'path': nbd_sock_path}}))
> +iotests.log('Exporting the block device to NBD server...')
> +iotests.log(dest_vm.qmp('nbd-server-add', device='drive0', writable=True))
> +iotests.log('Stopping the NBD server on destination...')
> +iotests.log(dest_vm.qmp('nbd-server-stop'))
> diff --git a/tests/qemu-iotests/192.out b/tests/qemu-iotests/192.out
> index
> 1e0be4c4d7a891f81c2536b87c5a29a21d39138c..f62b94c5641f1a1e60f17090aeb20ed0bc037afd
> 100644
> --- a/tests/qemu-iotests/192.out
> +++ b/tests/qemu-iotests/192.out
> @@ -1,7 +1,7 @@
> -QA output created by 192
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -QEMU X.Y.Z monitor - type 'help' for more information
> -(qemu) nbd_server_start unix:TEST_DIR/nbd
> -(qemu) nbd_server_add -w drive0
> -(qemu) q
> -*** done
> +Launching VM...
> +Launching NBD server on destination...
> +{u'return': {}}
> +Exporting the block device to NBD server...
> +{u'return': {}}
> +Stopping the NBD server on destination...
> +{u'return': {}}
> --
> 2.9.5
>
