From nobody Sun Feb 8 19:24:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633674957433373.98411142337704; Thu, 7 Oct 2021 23:35:57 -0700 (PDT) Received: from localhost ([::1]:54002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYjU4-0002lE-BE for importer@patchew.org; Fri, 08 Oct 2021 02:35:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYjNQ-0004ui-5V for qemu-devel@nongnu.org; Fri, 08 Oct 2021 02:29:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYjNE-0007uR-N9 for qemu-devel@nongnu.org; Fri, 08 Oct 2021 02:29:02 -0400 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-99-O-OgBOkvNlG1FGm0Jy5GwQ-1; Fri, 08 Oct 2021 02:28:50 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7677F100C618; Fri, 8 Oct 2021 06:28:49 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECA045D9F0; Fri, 8 Oct 2021 06:28:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633674531; 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; bh=LLKMojdA6PjCNJsCOFZy1ymDoLf22Ti2NM0lUjP4e5Y=; b=Rs7evfMLLD32KYWYNNr/MCxTGq5WBAPnOSjRP40zpOzKwYWW3Tdk2PvtYwAnvyzSFyprbF M+rypr+Q4mcZ4PAj+V1dZXEBLEqFUusnV+nWcZGCe7Pm5sr5O5NkqHUDVAZGoqVsGNe6yo 7Yn/uGKNvjrYRifybZmYcE0o8HRBhXM= X-MC-Unique: O-OgBOkvNlG1FGm0Jy5GwQ-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [PATCH v2 1/2] pylint: fix errors and warnings generated by tests/qemu-iotests/297 Date: Fri, 8 Oct 2021 02:28:20 -0400 Message-Id: <20211008062821.1010967-2-eesposit@redhat.com> In-Reply-To: <20211008062821.1010967-1-eesposit@redhat.com> References: <20211008062821.1010967-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eesposit@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.05, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 , Emanuele Giuseppe Esposito , Hanna Reitz , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1633674958761100001 Content-Type: text/plain; charset="utf-8" Test 297 in tests/qemu-iotests currently fails: pylint has learned new things to check, or we simply missed them. All fixes in this patch are related to additional spaces used or wrong indentation. No functional change intended. Signed-off-by: Emanuele Giuseppe Esposito --- tests/qemu-iotests/129 | 18 +++++++++--------- tests/qemu-iotests/310 | 16 ++++++++-------- tests/qemu-iotests/check | 11 ++++++----- tests/qemu-iotests/iotests.py | 7 ++++--- tests/qemu-iotests/tests/image-fleecing | 4 ++-- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129 index 5251e2669e..c75ec62ecf 100755 --- a/tests/qemu-iotests/129 +++ b/tests/qemu-iotests/129 @@ -77,8 +77,8 @@ class TestStopWithBlockJob(iotests.QMPTestCase): self.do_test_stop("drive-backup", device=3D"drive0", target=3Dself.target_img, format=3Diotests.imgfm= t, sync=3D"full", - x_perf=3D{ 'max-chunk': 65536, - 'max-workers': 8 }) + x_perf=3D{'max-chunk': 65536, + 'max-workers': 8}) =20 def test_block_commit(self): # Add overlay above the source node so that we actually use a @@ -88,13 +88,13 @@ class TestStopWithBlockJob(iotests.QMPTestCase): '1G') =20 result =3D self.vm.qmp('blockdev-add', **{ - 'node-name': 'overlay', - 'driver': iotests.imgfmt, - 'file': { - 'driver': 'file', - 'filename': self.overlay_img - } - }) + 'node-name': 'overlay', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': self.overlay_img + } + }) self.assert_qmp(result, 'return', {}) =20 result =3D self.vm.qmp('blockdev-snapshot', diff --git a/tests/qemu-iotests/310 b/tests/qemu-iotests/310 index 9d9c928c4b..33c3411869 100755 --- a/tests/qemu-iotests/310 +++ b/tests/qemu-iotests/310 @@ -48,11 +48,11 @@ with iotests.FilePath('base.img') as base_img_path, \ assert qemu_io_silent(base_img_path, '-c', 'write -P 1 3M 1M') =3D=3D 0 assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path, '-F', iotests.imgfmt, mid_img_path) =3D=3D 0 - assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 2M 1M') =3D=3D 0 - assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 4M 1M') =3D=3D 0 + assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 2M 1M') =3D=3D 0 + assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 4M 1M') =3D=3D 0 assert qemu_img('create', '-f', iotests.imgfmt, '-b', mid_img_path, '-F', iotests.imgfmt, top_img_path) =3D=3D 0 - assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') =3D=3D 0 =20 # 0 1 2 3 4 # top 2 @@ -108,10 +108,10 @@ with iotests.FilePath('base.img') as base_img_path, \ assert qemu_img('rebase', '-u', '-b', '', '-f', iotests.imgfmt, top_img_path) =3D=3D 0 =20 - assert qemu_io_silent(top_img_path, '-c', 'read -P 0 0 1M') =3D=3D 0 - assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') =3D=3D 0 - assert qemu_io_silent(top_img_path, '-c', 'read -P 3 2M 1M') =3D=3D 0 - assert qemu_io_silent(top_img_path, '-c', 'read -P 0 3M 1M') =3D=3D 0 - assert qemu_io_silent(top_img_path, '-c', 'read -P 3 4M 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 0 0 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 3 2M 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 0 3M 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 3 4M 1M') =3D=3D 0 =20 log('Done') diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index da1bfb839e..43a4b694cc 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -37,13 +37,14 @@ def make_argparser() -> argparse.ArgumentParser: =20 p.add_argument('-d', dest=3D'debug', action=3D'store_true', help=3D'de= bug') p.add_argument('-p', dest=3D'print', action=3D'store_true', - help=3D'redirects qemu\'s stdout and stderr to the test ou= tput') + help=3D'redirects qemu\'s stdout and stderr to ' + 'the test output') p.add_argument('-gdb', action=3D'store_true', - help=3D"start gdbserver with $GDB_OPTIONS options \ - ('localhost:12345' if $GDB_OPTIONS is empty)") + help=3D"start gdbserver with $GDB_OPTIONS options " + "('localhost:12345' if $GDB_OPTIONS is empty)") p.add_argument('-valgrind', action=3D'store_true', - help=3D'use valgrind, sets VALGRIND_QEMU environment ' - 'variable') + help=3D'use valgrind, sets VALGRIND_QEMU environment ' + 'variable') =20 p.add_argument('-misalign', action=3D'store_true', help=3D'misalign memory allocations') diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index ce06cf5630..168cc5736a 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -608,7 +608,7 @@ def _post_shutdown(self) -> None: super()._post_shutdown() if not qemu_valgrind or not self._popen: return - valgrind_filename =3D f"{test_dir}/{self._popen.pid}.valgrind" + valgrind_filename =3D f"{test_dir}/{self._popen.pid}.valgrind" if self.exitcode() =3D=3D 99: with open(valgrind_filename, encoding=3D'utf-8') as f: print(f.read()) @@ -1350,8 +1350,9 @@ def write(self, arg=3DNone): =20 class ReproducibleTestRunner(unittest.TextTestRunner): def __init__(self, stream: Optional[TextIO] =3D None, - resultclass: Type[unittest.TestResult] =3D ReproducibleTestRe= sult, - **kwargs: Any) -> None: + resultclass: Type[unittest.TestResult] =3D + ReproducibleTestResult, + **kwargs: Any) -> None: rstream =3D ReproducibleStreamWrapper(stream or sys.stdout) super().__init__(stream=3Drstream, # type: ignore descriptions=3DTrue, diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/t= ests/image-fleecing index f6318492c6..8c5472f421 100755 --- a/tests/qemu-iotests/tests/image-fleecing +++ b/tests/qemu-iotests/tests/image-fleecing @@ -114,8 +114,8 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nb= d_sock_path, vm): =20 nbd_uri =3D 'nbd+unix:///%s?socket=3D%s' % (tmp_node, nbd_sock_path) log(vm.qmp('nbd-server-start', - {'addr': { 'type': 'unix', - 'data': { 'path': nbd_sock_path } } })) + {'addr': {'type': 'unix', + 'data': {'path': nbd_sock_path}}})) =20 log(vm.qmp('nbd-server-add', device=3Dtmp_node)) =20 --=20 2.27.0 From nobody Sun Feb 8 19:24:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633674750354438.7448997016928; Thu, 7 Oct 2021 23:32:30 -0700 (PDT) Received: from localhost ([::1]:47588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYjQi-0006j5-3Q for importer@patchew.org; Fri, 08 Oct 2021 02:32:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYjNO-0004uY-RG for qemu-devel@nongnu.org; Fri, 08 Oct 2021 02:29:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYjNE-0007us-VD for qemu-devel@nongnu.org; Fri, 08 Oct 2021 02:29:02 -0400 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-386-_bfkV15xO2CBqDPywhfIUA-1; Fri, 08 Oct 2021 02:28:50 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08E48100C61A; Fri, 8 Oct 2021 06:28:50 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F1C35D9C6; Fri, 8 Oct 2021 06:28:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633674531; 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; bh=8z7PmuUSUbX+pSVX0kyium85dFA+rvfcmUkxh8ivRkE=; b=XTwpXJ4D5mSwS6HyrMyrFAsxzzUYxQ3SOjHKTOaPzdTSo/imy9HAseB8PQhrVBvbZsmJIR 8MVCBRM7fFOzcqxwwBvA9ioEYWa7vAQDwIprAE1bZsdK82i0bzJvjISNv56IOeOcicwF3v rYkDcg4H2oHrK62l4yNOldkwkirdIY4= X-MC-Unique: _bfkV15xO2CBqDPywhfIUA-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [PATCH v2 2/2] qemu-iotests: fix image-fleecing pylint errors Date: Fri, 8 Oct 2021 02:28:21 -0400 Message-Id: <20211008062821.1010967-3-eesposit@redhat.com> In-Reply-To: <20211008062821.1010967-1-eesposit@redhat.com> References: <20211008062821.1010967-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eesposit@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) DKIMWL_WL_HIGH=-0.05, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 , Emanuele Giuseppe Esposito , Hanna Reitz , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1633674751726100001 Content-Type: text/plain; charset="utf-8" The problem here is that some variables are formatted with unnecessary spaces to make it prettier and easier to read. However, pylint complains about those additional spaces. Temporarly remove the check, but just on those variables. Signed-off-by: Emanuele Giuseppe Esposito --- tests/qemu-iotests/tests/image-fleecing | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/t= ests/image-fleecing index 8c5472f421..99101fe902 100755 --- a/tests/qemu-iotests/tests/image-fleecing +++ b/tests/qemu-iotests/tests/image-fleecing @@ -30,6 +30,9 @@ iotests.script_initialize( supported_platforms=3D['linux'], ) =20 +# Temporarly disable bad-whitespace pylint check to keep +# this formatting. +# pylint: disable=3Dbad-whitespace patterns =3D [('0x5d', '0', '64k'), ('0xd5', '1M', '64k'), ('0xdc', '32M', '64k'), @@ -47,6 +50,7 @@ zeroes =3D [('0', '0x00f8000', '32k'), # Left-end of part= ial-left (1M-32K) remainder =3D [('0xd5', '0x108000', '32k'), # Right-end of partial-left [= 1] ('0xdc', '32M', '32k'), # Left-end of partial-right [2] ('0xcd', '0x3ff0000', '64k')] # patterns[3] +# pylint: enable=3Dbad-whitespace =20 def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm): log('--- Setting up images ---') --=20 2.27.0