From nobody Sun Apr 13 18:09:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614964385; cv=none; d=zohomail.com; s=zohoarc; b=H/UpVrb1Ef7Ik+njPDeIqH47UHZPbyZRlP5tDWp/Qd8DgJCFK+7GvM+akQ/f3GDVqqqLENSXLK/5XSdi2iaCUoAo9Il7rNuHHo2B1tmfYqH1pBOCVX1CKR4mNQeY2++Z/6qt3Z/tEA4UgW9jeDQ378vwAiD5uW5TsxR+yI5YmH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614964385; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VF98KSzLbmqEjHnWVEXHrpPBNZqP8dKQmGu7jqXOY2M=; b=m4jlK4YQrI0NjxIOEh1am3IizIpE7ImNG9EFM4JZke2eb2UwUi29dkNzfM2LHpRwRNcfxKPZQV3YrG6kncfmESywz/7ZM8Ms346ec9VhfGJWJgo5JcyC76mAFZ3U+0ZVOSD6RvegPw7clU+Z0aXnk+Wj37jcwAdO/Nc0roBDG/c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614964385134766.5269884834062; Fri, 5 Mar 2021 09:13:05 -0800 (PST) Received: from localhost ([::1]:35314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIE0d-0003mc-Ps for importer@patchew.org; Fri, 05 Mar 2021 12:13:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIDkH-0006tZ-1r for qemu-devel@nongnu.org; Fri, 05 Mar 2021 11:56:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lIDk5-0007CX-3n for qemu-devel@nongnu.org; Fri, 05 Mar 2021 11:56:08 -0500 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-254-qVaeBIEmM_qt5ViBwg5HDQ-1; Fri, 05 Mar 2021 11:55:52 -0500 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 23C24100A44D; Fri, 5 Mar 2021 16:55:14 +0000 (UTC) Received: from merkur.redhat.com (ovpn-112-36.phx2.redhat.com [10.3.112.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 143A960BF3; Fri, 5 Mar 2021 16:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614963356; 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=VF98KSzLbmqEjHnWVEXHrpPBNZqP8dKQmGu7jqXOY2M=; b=FfinuYpN8n54oV/tAOrdlMR9U8I3tv05u5n+xgift8jtRx0yE9tOGj+iCe4yenAm2cXeMD YSmnhYwV3puu4XDNr3mXiM303WZWGD4vvvcxaB6QMJx/TwHoa73TzimRytPX2r2eGCunjc Jepys13DVY8ZThUUJ6rIzQIWSquUmKg= X-MC-Unique: qVaeBIEmM_qt5ViBwg5HDQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 05/31] iotests: Fix up python style in 300 Date: Fri, 5 Mar 2021 17:54:28 +0100 Message-Id: <20210305165454.356840-6-kwolf@redhat.com> In-Reply-To: <20210305165454.356840-1-kwolf@redhat.com> References: <20210305165454.356840-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@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=63.128.21.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Eric Blake Break some long lines, and relax our type hints to be more generic to any JSON, in order to more easily permit the additional JSON depth now possible in migration parameters. Detected by iotest 297. Fixes: ca4bfec41d56 (qemu-iotests: 300: Add test case for modifying persistence of bitmap) Reported-by: Kevin Wolf Signed-off-by: Eric Blake Message-Id: <20210215220518.1745469-1-eblake@redhat.com> Reviewed-by: John Snow Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Kevin Wolf --- tests/qemu-iotests/300 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/300 b/tests/qemu-iotests/300 index 63036f6a6e..adb9276297 100755 --- a/tests/qemu-iotests/300 +++ b/tests/qemu-iotests/300 @@ -22,7 +22,7 @@ import os import random import re -from typing import Dict, List, Optional, Union +from typing import Dict, List, Optional =20 import iotests =20 @@ -30,7 +30,7 @@ import iotests # pylint: disable=3Dwrong-import-order import qemu =20 -BlockBitmapMapping =3D List[Dict[str, Union[str, List[Dict[str, str]]]]] +BlockBitmapMapping =3D List[Dict[str, object]] =20 mig_sock =3D os.path.join(iotests.sock_dir, 'mig_sock') =20 @@ -602,7 +602,8 @@ class TestCrossAliasMigration(TestDirtyBitmapMigration): =20 class TestAliasTransformMigration(TestDirtyBitmapMigration): """ - Tests the 'transform' option which modifies bitmap persistence on migr= ation. + Tests the 'transform' option which modifies bitmap persistence on + migration. """ =20 src_node_name =3D 'node-a' @@ -674,7 +675,8 @@ class TestAliasTransformMigration(TestDirtyBitmapMigrat= ion): bitmaps =3D self.vm_b.query_bitmaps() =20 for node in bitmaps: - bitmaps[node] =3D sorted(((bmap['name'], bmap['persistent']) f= or bmap in bitmaps[node])) + bitmaps[node] =3D sorted(((bmap['name'], bmap['persistent']) + for bmap in bitmaps[node])) =20 self.assertEqual(bitmaps, {'node-a': [('bmap-a', True), ('bmap-b', False)], --=20 2.29.2