From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50161C43331 for ; Wed, 1 Apr 2020 12:41:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1922A20776 for ; Wed, 1 Apr 2020 12:41:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="H40ZN4dX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1922A20776 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJcgg-0005vg-6a for qemu-devel@archiver.kernel.org; Wed, 01 Apr 2020 08:41:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55938) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJcfy-0005Lj-M4 for qemu-devel@nongnu.org; Wed, 01 Apr 2020 08:41:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJcfw-00079a-Vs for qemu-devel@nongnu.org; Wed, 01 Apr 2020 08:40:58 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:34721 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJcfw-00072c-Pi for qemu-devel@nongnu.org; Wed, 01 Apr 2020 08:40:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585744855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=nE7QlW7WMeIwwghxfn3X/cgpgkwQi7lGBezgIeo0FVQ=; b=H40ZN4dXMRT/iQL6b0atLDIEWp0AapmSSCZG2TiiPoXtg8l+0XU6Uh3CemBWYn6Iw0gryl RxEqPE/kCVYmT+AgiS5+gSRmaZvieHR9pcnP53X5dFkxMj+MZ3XyNTMpK5mqpnyu46neTj 29pHgRxJl3uKc32v8JLRiU8yN4cNtrA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-329-qQ0OT55HO1e_G23pqp33qg-1; Wed, 01 Apr 2020 08:40:53 -0400 X-MC-Unique: qQ0OT55HO1e_G23pqp33qg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E6B83800D4E; Wed, 1 Apr 2020 12:40:52 +0000 (UTC) Received: from dresden.str.redhat.com (ovpn-115-160.ams2.redhat.com [10.36.115.160]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 55E2C5C1C5; Wed, 1 Apr 2020 12:40:50 +0000 (UTC) Subject: Re: [PATCH v10 10/14] iotests: add hmp helper with logging To: Kevin Wolf , John Snow References: <20200331000014.11581-1-jsnow@redhat.com> <20200331000014.11581-11-jsnow@redhat.com> <88146808-4acc-247e-d34b-5dd16baad0b4@redhat.com> <20200331173945.GL7030@linux.fritz.box> From: Max Reitz Autocrypt: addr=mreitz@redhat.com; prefer-encrypt=mutual; keydata= mQENBFXOJlcBCADEyyhOTsoa/2ujoTRAJj4MKA21dkxxELVj3cuILpLTmtachWj7QW+TVG8U /PsMCFbpwsQR7oEy8eHHZwuGQsNpEtNC2G/L8Yka0BIBzv7dEgrPzIu+W3anZXQW4702+uES U29G8TP/NGfXRRHGlbBIH9KNUnOSUD2vRtpOLXkWsV5CN6vQFYgQfFvmp5ZpPeUe6xNplu8V mcTw8OSEDW/ZnxJc8TekCKZSpdzYoxfzjm7xGmZqB18VFwgJZlIibt1HE0EB4w5GsD7x5ekh awIe3RwoZgZDLQMdOitJ1tUc8aqaxvgA4tz6J6st8D8pS//m1gAoYJWGwwIVj1DjTYLtABEB AAG0HU1heCBSZWl0eiA8bXJlaXR6QHJlZGhhdC5jb20+iQFTBBMBCAA9AhsDBQkSzAMABQsJ CAcCBhUICQoLAgQWAgMBAh4BAheABQJVzie5FRhoa3A6Ly9rZXlzLmdudXBnLm5ldAAKCRD0 B9sAYdXPQDcIB/9uNkbYEex1rHKz3mr12uxYMwLOOFY9fstP5aoVJQ1nWQVB6m2cfKGdcRe1 2/nFaHSNAzT0NnKz2MjhZVmcrpyd2Gp2QyISCfb1FbT82GMtXFj1wiHmPb3CixYmWGQUUh+I AvUqsevLA+WihgBUyaJq/vuDVM1/K9Un+w+Tz5vpeMidlIsTYhcsMhn0L9wlCjoucljvbDy/ 8C9L2DUdgi3XTa0ORKeflUhdL4gucWoAMrKX2nmPjBMKLgU7WLBc8AtV+84b9OWFML6NEyo4 4cP7cM/07VlJK53pqNg5cHtnWwjHcbpGkQvx6RUx6F1My3y52vM24rNUA3+ligVEgPYBuQEN BFXOJlcBCADAmcVUNTWT6yLWQHvxZ0o47KCP8OcLqD+67T0RCe6d0LP8GsWtrJdeDIQk+T+F xO7DolQPS6iQ6Ak2/lJaPX8L0BkEAiMuLCKFU6Bn3lFOkrQeKp3u05wCSV1iKnhg0UPji9V2 W5eNfy8F4ZQHpeGUGy+liGXlxqkeRVhLyevUqfU0WgNqAJpfhHSGpBgihUupmyUg7lfUPeRM DzAN1pIqoFuxnN+BRHdAecpsLcbR8sQddXmDg9BpSKozO/JyBmaS1RlquI8HERQoe6EynJhd 64aICHDfj61rp+/0jTIcevxIIAzW70IadoS/y3DVIkuhncgDBvGbF3aBtjrJVP+5ABEBAAGJ ASUEGAEIAA8FAlXOJlcCGwwFCRLMAwAACgkQ9AfbAGHVz0CbFwf9F/PXxQR9i4N0iipISYjU sxVdjJOM2TMut+ZZcQ6NSMvhZ0ogQxJ+iEQ5OjnIputKvPVd5U7WRh+4lF1lB/NQGrGZQ1ic alkj6ocscQyFwfib+xIe9w8TG1CVGkII7+TbS5pXHRxZH1niaRpoi/hYtgzkuOPp35jJyqT/ /ELbqQTDAWcqtJhzxKLE/ugcOMK520dJDeb6x2xVES+S5LXby0D4juZlvUj+1fwZu+7Io5+B bkhSVPb/QdOVTpnz7zWNyNw+OONo1aBUKkhq2UIByYXgORPFnbfMY7QWHcjpBVw9MgC4tGeF R4bv+1nAMMxKmb5VvQCExr0eFhJUAHAhVg== Message-ID: <0c8ce9c5-d8b4-4b24-a6e3-4b9863c52fe0@redhat.com> Date: Wed, 1 Apr 2020 14:40:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200331173945.GL7030@linux.fritz.box> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7ZOCxlKI0Q6pSfPMyt20hL2n6VQoY2lfk" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, qemu-block@nongnu.org, philmd@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7ZOCxlKI0Q6pSfPMyt20hL2n6VQoY2lfk Content-Type: multipart/mixed; boundary="QbgkaciuYEoFW0rkKXiwvjTqxuNRTTcKn" --QbgkaciuYEoFW0rkKXiwvjTqxuNRTTcKn Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 31.03.20 19:39, Kevin Wolf wrote: > Am 31.03.2020 um 19:23 hat John Snow geschrieben: >> >> >> On 3/31/20 6:21 AM, Max Reitz wrote: >>> On 31.03.20 02:00, John Snow wrote: >>>> Minor cleanup for HMP functions; helps with line length and consolidat= es >>>> HMP helpers through one implementation function. >>>> >>>> Although we are adding a universal toggle to turn QMP logging on or of= f, >>>> many existing callers to hmp functions don't expect that output to be >>>> logged, which causes quite a few changes in the test output. >>>> >>>> For now, offer a use_log parameter. >>>> >>>> >>>> Typing notes: >>>> >>>> QMPResponse is just an alias for Dict[str, Any]. It holds no special >>>> meanings and it is not a formal subtype of Dict[str, Any]. It is best >>>> thought of as a lexical synonym. >>>> >>>> We may well wish to add stricter subtypes in the future for certain >>>> shapes of data that are not formalized as Python objects, at which poi= nt >>>> we can simply retire the alias and allow mypy to more strictly check >>>> usages of the name. >>>> >>>> Signed-off-by: John Snow >>>> --- >>>> tests/qemu-iotests/iotests.py | 35 ++++++++++++++++++++++------------= - >>>> 1 file changed, 22 insertions(+), 13 deletions(-) >>> >>> Reviewed-by: Max Reitz >>> >>>> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotest= s.py >>>> index b08bcb87e1..dfc753c319 100644 >>>> --- a/tests/qemu-iotests/iotests.py >>>> +++ b/tests/qemu-iotests/iotests.py >>>> @@ -37,6 +37,10 @@ >>>> =20 >>>> assert sys.version_info >=3D (3, 6) >>>> =20 >>>> +# Type Aliases >>>> +QMPResponse =3D Dict[str, Any] >>>> + >>>> + >>>> faulthandler.enable() >>>> =20 >>>> # This will not work if arguments contain spaces but is necessary if = we >>>> @@ -540,25 +544,30 @@ def add_incoming(self, addr): >>>> self._args.append(addr) >>>> return self >>>> =20 >>>> - def pause_drive(self, drive, event=3DNone): >>>> - '''Pause drive r/w operations''' >>>> + def hmp(self, command_line: str, use_log: bool =3D False) -> QMPR= esponse: >>>> + cmd =3D 'human-monitor-command' >>>> + kwargs =3D {'command-line': command_line} >>>> + if use_log: >>>> + return self.qmp_log(cmd, **kwargs) >>>> + else: >>>> + return self.qmp(cmd, **kwargs) >>> >>> Hm. I suppose I should take this chance to understand something about >>> mypy. QEMUMachine.qmp() isn=E2=80=99t typed, so mypy can=E2=80=99t che= ck that this >>> really returns QMPResponse. Is there some flag to make it? Like >>> --actually-check-types? >>> >> >> One of --strict's implied options, I'm not sure which. Otherwise, mypy >> is geared towards a 'gradual typing' discipline. >> >> In truth, I'm a little thankful for that because it helps avoid yak >> shaving marathons. Sure. I was just looking into the different options. I was interested in whether I could come up with a mode that leaves wholly untyped code alone, but warns for code that mixes it. Or something. >> It does mean that sometimes the annotations don't "do anything" yet, >> apart from offering hints and documentation in e.g. pycharm. Which does >> mean that sometimes they can be completely wrong... >> >> The more we add, the more we'll catch problems. >> >> Once this series is dusted I'll try to tackle more conversions for >> iotests, qmp, etc. I've got a few WIP patches to tackle conversions for >> tests/qemu-iotests/*.py but I am trying to shepherd this one in first >> before I go bananas. Sure, sure. >>> (--strict seems, well, overly strict? Like not allowing generics, I >>> don=E2=80=99t see why. Or I suppose for the time being we want to allo= w untyped >>> definitions, as long as they don=E2=80=99t break type assertions such a= s it kind >>> of does here...?) >>> >> >> "disallow-any-generics" means disallowing `Any` generics, not >> disallowing generics ... in general. (I think? I've been using mypy in >> strict mode for a personal project a lot lately and I use generics in a >> few places, it seems OK.) >=20 > --disallow-any-generics > disallow usage of generic types that do not specify explicit type p= arameters >=20 > So it will complain if you say just List, and you need to be explicit if > you really want List[Any]. Which I think is a reasonable thing to > require. OK. So it=E2=80=99s =E2=80=9Cdisallow =E2=80=98any=E2=80=99 generics=E2=80= =9D, not =E2=80=9Cdisallow any =E2=80=98generic=E2=80=99s=E2=80=9D. Not easy to parse. (Yes, yes, I should=E2=80=99ve actually read the man pa= ge...) Good to know that mypy and me actually do seem to loosely agree on what a generic is. :) Max --QbgkaciuYEoFW0rkKXiwvjTqxuNRTTcKn-- --7ZOCxlKI0Q6pSfPMyt20hL2n6VQoY2lfk Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAl6Ei9AACgkQ9AfbAGHV z0AbQwf+LFhgzvr8JM7nOFVgGPmoy7xWB+OCzRkdOGD9LHGBTxd4GhfWm1Y9dYue l16grDqyJAMcNkweKOh+JC4CPCApX1rLfxIVg92sVWZd072L3JUodekEZLmNVqWd ZaIYz6RRqpImFWhsoQpnLIcsOf2ln2tQmO6xlWaWBV7rRAksk3IQbO64c35swl8K 0YfvxqTYCZvr6bG5M14DJ78D0oOyMg+LJefsxD3SkStqgsjmHQCZezwFux5EnAyo dlOjThOtnHJUEzfIlQ+y60wxUSHswKGgKz9jafxXIqK6s7X7yS47NY+qhNE9eNaF ksAveEVxixL0cxcTUAyYCk/pR7TmaQ== =e20U -----END PGP SIGNATURE----- --7ZOCxlKI0Q6pSfPMyt20hL2n6VQoY2lfk--