From nobody Thu Apr 24 11:42:24 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=1633518335; cv=none;
d=zohomail.com; s=zohoarc;
b=lVcOr4XPoThVRUzhWbih1u4+7iv0nkPezM/CXZnJ6damsIBsOEFhF65sKZwozrAg9Sczs9+QUv5u4nkWdnkdeKT6kvi6oqaYPtm9gyFumWlSEgvDtRU3pEhxUpr2Z/9BggABvUSKLPAD/VrW9Wc1f+4zQd3c0nQHFdJnORDEOR8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1633518335;
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=ZPtjiCKVVEri6iQwWSCVij/O6XAB1ecFMaM/jNY0QkU=;
b=cgdchNfcV6HOgSpXwYqA2tosSMcT+H/5u9xzNdyExzaaRJJGxq5Xzd67vJ63Hr3OSIwNyipDoxva5jLacZOeN1Gn462o2w9NisT3u1L5tuwjghDuSILRCNeEpqpZeUe36eSAiU9ORfmN85GpNA0a3iNJoJUfkFVn76hNkcppE8A=
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=<kwolf@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1633518335352215.61245239032837;
Wed, 6 Oct 2021 04:05:35 -0700 (PDT)
Received: from localhost ([::1]:44316 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1mY4ju-0004mt-93
for importer@patchew.org; Wed, 06 Oct 2021 07:05:34 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:35714)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1mY4en-0000r2-0q
for qemu-devel@nongnu.org; Wed, 06 Oct 2021 07:00:17 -0400
Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57629)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1mY4ei-0006Ti-Lt
for qemu-devel@nongnu.org; Wed, 06 Oct 2021 07:00:15 -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-436-Y2mfIStOM4qTIRsFniMmMQ-1; Wed, 06 Oct 2021 07:00:08 -0400
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 08779802928;
Wed, 6 Oct 2021 11:00:08 +0000 (UTC)
Received: from merkur.fritz.box (unknown [10.39.194.113])
by smtp.corp.redhat.com (Postfix) with ESMTP id 529AA60BE5;
Wed, 6 Oct 2021 11:00:03 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1633518012;
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=ZPtjiCKVVEri6iQwWSCVij/O6XAB1ecFMaM/jNY0QkU=;
b=RpWptR0nonXH7sjsB2eYiluX8xSbDmrKuIaYHItjxG6uEltBAtdSoUEIoK9Jmyg1uWNTma
kNQ7NKzwvaUjJQuJRAr+2wnk5NjKOPn98iG3jWCF5Eu2orxwpP7kD+d68GNHTktE/F/MRd
deAdk8TAyQhe4eaoP685hymGRQJkPXY=
X-MC-Unique: Y2mfIStOM4qTIRsFniMmMQ-1
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Subject: [PULL 12/13] iotests/migrate-bitmaps-test: delint
Date: Wed, 6 Oct 2021 12:59:22 +0200
Message-Id: <20211006105923.223549-13-kwolf@redhat.com>
In-Reply-To: <20211006105923.223549-1-kwolf@redhat.com>
References: <20211006105923.223549-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-Type: text/plain; charset="utf-8"
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=kwolf@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=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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1633518336230100002
From: John Snow <jsnow@redhat.com>
Mostly uninteresting stuff. Move the test injections under a function
named main() so that the variables used during that process aren't in
the global scope.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210923180715.4168522-6-jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/tests/migrate-bitmaps-test | 50 +++++++++++--------
1 file changed, 28 insertions(+), 22 deletions(-)
diff --git a/tests/qemu-iotests/tests/migrate-bitmaps-test b/tests/qemu-iot=
ests/tests/migrate-bitmaps-test
index dc431c35b3..c23df3d75c 100755
--- a/tests/qemu-iotests/tests/migrate-bitmaps-test
+++ b/tests/qemu-iotests/tests/migrate-bitmaps-test
@@ -19,10 +19,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
=20
-import os
import itertools
import operator
+import os
import re
+
import iotests
from iotests import qemu_img, qemu_img_create, Timeout
=20
@@ -224,25 +225,6 @@ def inject_test_case(klass, suffix, method, *args, **k=
wargs):
setattr(klass, 'test_' + method + suffix, lambda self: mc(self))
=20
=20
-for cmb in list(itertools.product((True, False), repeat=3D5)):
- name =3D ('_' if cmb[0] else '_not_') + 'persistent_'
- name +=3D ('_' if cmb[1] else '_not_') + 'migbitmap_'
- name +=3D '_online' if cmb[2] else '_offline'
- name +=3D '_shared' if cmb[3] else '_nonshared'
- if cmb[4]:
- name +=3D '__pre_shutdown'
-
- inject_test_case(TestDirtyBitmapMigration, name, 'do_test_migration',
- *list(cmb))
-
-for cmb in list(itertools.product((True, False), repeat=3D2)):
- name =3D ('_' if cmb[0] else '_not_') + 'persistent_'
- name +=3D ('_' if cmb[1] else '_not_') + 'migbitmap'
-
- inject_test_case(TestDirtyBitmapMigration, name,
- 'do_test_migration_resume_source', *list(cmb))
-
-
class TestDirtyBitmapBackingMigration(iotests.QMPTestCase):
def setUp(self):
qemu_img_create('-f', iotests.imgfmt, base_a, size)
@@ -304,6 +286,30 @@ class TestDirtyBitmapBackingMigration(iotests.QMPTestC=
ase):
self.assert_qmp(result, 'return', {})
=20
=20
+def main() -> None:
+ for cmb in list(itertools.product((True, False), repeat=3D5)):
+ name =3D ('_' if cmb[0] else '_not_') + 'persistent_'
+ name +=3D ('_' if cmb[1] else '_not_') + 'migbitmap_'
+ name +=3D '_online' if cmb[2] else '_offline'
+ name +=3D '_shared' if cmb[3] else '_nonshared'
+ if cmb[4]:
+ name +=3D '__pre_shutdown'
+
+ inject_test_case(TestDirtyBitmapMigration, name, 'do_test_migratio=
n',
+ *list(cmb))
+
+ for cmb in list(itertools.product((True, False), repeat=3D2)):
+ name =3D ('_' if cmb[0] else '_not_') + 'persistent_'
+ name +=3D ('_' if cmb[1] else '_not_') + 'migbitmap'
+
+ inject_test_case(TestDirtyBitmapMigration, name,
+ 'do_test_migration_resume_source', *list(cmb))
+
+ iotests.main(
+ supported_fmts=3D['qcow2'],
+ supported_protocols=3D['file']
+ )
+
+
if __name__ =3D=3D '__main__':
- iotests.main(supported_fmts=3D['qcow2'],
- supported_protocols=3D['file'])
+ main()
--=20
2.31.1