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.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 0B7BAC3F2D1 for ; Tue, 3 Mar 2020 21:26:50 +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 B8F0F208C3 for ; Tue, 3 Mar 2020 21:26:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ah6TMsAS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B8F0F208C3 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]:53898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9F3x-0003QL-0E for qemu-devel@archiver.kernel.org; Tue, 03 Mar 2020 16:26:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52721) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9F3G-0002tz-Kd for qemu-devel@nongnu.org; Tue, 03 Mar 2020 16:26:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9F3E-0001Fa-V9 for qemu-devel@nongnu.org; Tue, 03 Mar 2020 16:26:06 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44483 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9F3E-0001FR-Qg for qemu-devel@nongnu.org; Tue, 03 Mar 2020 16:26:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583270764; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=aNmi+oivqAqmK+gqppqDRFzopxrTz9WNrzFtmTFzkxc=; b=Ah6TMsASwwYSssfkHzsvE64vKkXwyjwm8MsF1W3i8pMVBwI8PJUFq/yySzsEV3uEvAnHpP /K3pnTOfWKSXJJHapTOkbzepgYUKmBnsh83+nscpCqkMnQ2uHnxJzCoccD++sI2uQWmWrw v7XKxDRdMilVLTh7qM4pwDxKPVX6A68= 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-1-ptim7MAkM0K72vbpqU0oFQ-1; Tue, 03 Mar 2020 16:26:02 -0500 X-MC-Unique: ptim7MAkM0K72vbpqU0oFQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D879DB2E; Tue, 3 Mar 2020 21:26:01 +0000 (UTC) Received: from [10.10.120.212] (ovpn-120-212.rdu2.redhat.com [10.10.120.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FA2360C87; Tue, 3 Mar 2020 21:26:00 +0000 (UTC) Subject: Re: [PATCH v6 1/9] iotests: do a light delinting To: Max Reitz , qemu-devel@nongnu.org References: <20200227000639.9644-1-jsnow@redhat.com> <20200227000639.9644-2-jsnow@redhat.com> <5c3f3029-37c3-dd97-efb7-ea244742ab51@redhat.com> From: John Snow Autocrypt: addr=jsnow@redhat.com; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Tue, 3 Mar 2020 16:25:59 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <5c3f3029-37c3-dd97-efb7-ea244742ab51@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Kevin Wolf , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2/27/20 7:59 AM, Max Reitz wrote: > On 27.02.20 01:06, John Snow wrote: >> This doesn't fix everything in here, but it does help clean up the >> pylint report considerably. >> >> This should be 100% style changes only; the intent is to make pylint >> more useful by working on establishing a baseline for iotests that we >> can gate against in the future. This will be important if (when?) we >> begin adding type hints to our code base. >> >> Signed-off-by: John Snow >> --- >> tests/qemu-iotests/iotests.py | 88 ++++++++++++++++++----------------- >> 1 file changed, 45 insertions(+), 43 deletions(-) >=20 > I feel like I=E2=80=99m the wrongest person there is for reviewing a Pyth= on > style-fixing patch, but here I am and so here I go: >=20 No, it's good. >> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.= py >> index 8815052eb5..e8a0ea14fc 100644 >> --- a/tests/qemu-iotests/iotests.py >> +++ b/tests/qemu-iotests/iotests.py >=20 > [...] >=20 >> @@ -245,8 +243,7 @@ def qemu_nbd_early_pipe(*args): >> ' '.join(qemu_nbd_args + ['--fork'] + list(ar= gs)))) >> if exitcode =3D=3D 0: >> return exitcode, '' >> - else: >> - return exitcode, subp.communicate()[0] >> + return exitcode, subp.communicate()[0] >=20 > If we want to make such a change (which I don=E2=80=99t doubt we want), I= think > it should be the other way around: Make the condition =E2=80=9Cexitcode != =3D 0=E2=80=9D, > so the final return is the return for the successful case. (Just > because I think that=E2=80=99s how we usually do it, at least in the qemu= code?) >=20 > [...] >=20 Yes, makes sense. I was behaving a little more mechanically. >> @@ -455,10 +452,9 @@ def file_path(*names, base_dir=3Dtest_dir): >> def remote_filename(path): >> if imgproto =3D=3D 'file': >> return path >> - elif imgproto =3D=3D 'ssh': >> + if imgproto =3D=3D 'ssh': >=20 > This seems like a weird thing to complain about for a coding style > check, but whatever. >=20 > (As in, I prefer the elif form) >=20 Honestly, I do too. We can silence the warning instead. This warning option doesn't like "if return else return" constructs, preferring instead: if x: return 0 return 1 but I have to admit that I often like to see the branches laid out as branches, too. Other Pythonistas (Eduardo, Philippe, Markus?) -- strong feelings one way or the other? >> return "ssh://%s@127.0.0.1:22%s" % (os.environ.get('USER'), pat= h) >> - else: >> - raise Exception("Protocol %s not supported" % (imgproto)) >> + raise Exception("Protocol %s not supported" % (imgproto)) >> =20 >> class VM(qtest.QEMUQtestMachine): >> '''A QEMU VM''' >=20 > [...] >=20 >> @@ -756,12 +750,13 @@ def assert_block_path(self, root, path, expected_n= ode, graph=3DNone): >> assert node is not None, 'Cannot follow path %s%s' % (root,= path) >> =20 >> try: >> - node_id =3D next(edge['child'] for edge in graph['edges= '] \ >> - if edge['parent'] =3D=3D n= ode['id'] and >> - edge['name'] =3D=3D chi= ld_name) >> + node_id =3D next(edge['child'] for edge in graph['edges= '] >> + if edge['parent'] =3D=3D node['id'] and >> + edge['name'] =3D=3D child_name) >=20 > I don=E2=80=99t mind the if alignment, but I do mind not aligning the thi= rd line > to the =E2=80=9Cedge=E2=80=9D above it (i.e. the third line is part of th= e condition, so > I=E2=80=99d align it to the =E2=80=9Cif=E2=80=9D condition). >=20 > But then again it=E2=80=99s nothing new that I like to disagree with comm= only > agreed-upon Python coding styles, so. >=20 > [...] >=20 OK, that can be addressed by highlighting the sub-expression with parentheses: node_id =3D next(edge['child'] for edge in graph['edges'] if (edge['parent'] =3D=3D node['id'] and edge['name'] =3D=3D child_name)) >> @@ -891,13 +892,14 @@ def wait_until_completed(self, drive=3D'drive0', c= heck_offset=3DTrue, wait=3D60.0, >> self.assert_qmp(event, 'data/error', error) >> self.assert_no_active_block_jobs() >> return event >> - elif event['event'] =3D=3D 'JOB_STATUS_CHANGE': >> + if event['event'] =3D=3D 'JOB_STATUS_CHANGE': >> self.assert_qmp(event, 'data/id', drive) >> =20 >> def wait_ready(self, drive=3D'drive0'): >> '''Wait until a block job BLOCK_JOB_READY event''' >> - f =3D {'data': {'type': 'mirror', 'device': drive } } >> + f =3D {'data': {'type': 'mirror', 'device': drive}} >> event =3D self.vm.event_wait(name=3D'BLOCK_JOB_READY', match=3D= f) >> + return event >=20 > Why not just =E2=80=9Creturn self.vm.event_wait=E2=80=A6=E2=80=9D? >=20 Shrug. Sometimes I name my return variables when working in Python to give some semantic clue over what exactly I'm even returning. I can change it; but the docstring will grow to describe what it returns to re-document the same. --js