From nobody Tue Nov 18 15:24:42 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1610646238; cv=none; d=zohomail.com; s=zohoarc; b=iuygOsmxDq9bVoMguy04rbjs1IKoAHwLRhoZR8eEkjWY0JC3i7pLk/tu1T8Hfh0vwB+BjnB/gLHYHGEKhzlGZ4UhpgJtVrBEE8Q3Zb7Q48zg3v3vmXg1BsJuqjMWQ2SIcRFPUbZmzEkjPeZhtvohYkRPloY9RRv6FOVCRdfXgZs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610646238; 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=ml7ShADg32L/X4Ot+87tc9sMP34mb0kfAydIJ0wnwOk=; b=ZeC9E4j+0B/dM2mWWyV0dOPfv6pOG0bAcRic8w1Adl+E/mFzlIYn3mCYd8CabOXWdDvaHCbOKX+nFpiHsf+m55Yp6A5Njg365xvN5X25fkSGbRQU+ByOj2y/Wjn22x7sbXQBwIE0jj7/ry0COwq6IXagHRIZu00/AZ7ogpS3VKU= ARC-Authentication-Results: i=1; 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 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 1610646238942729.8654352134412; Thu, 14 Jan 2021 09:43:58 -0800 (PST) Received: from localhost ([::1]:41868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l06f7-0007Ik-P8 for importer@patchew.org; Thu, 14 Jan 2021 12:43:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l062D-0007et-Tm for qemu-devel@nongnu.org; Thu, 14 Jan 2021 12:03:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47794) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l062A-0006yd-9D for qemu-devel@nongnu.org; Thu, 14 Jan 2021 12:03:45 -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-590-oH4s-2YSOFOCMT1B4sUgUw-1; Thu, 14 Jan 2021 12:03:34 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED0C71927803; Thu, 14 Jan 2021 17:03:32 +0000 (UTC) Received: from localhost (ovpn-115-31.ams2.redhat.com [10.36.115.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 86D3610023BD; Thu, 14 Jan 2021 17:03:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610643816; 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=ml7ShADg32L/X4Ot+87tc9sMP34mb0kfAydIJ0wnwOk=; b=akNUWuBO04M/NuC5HiyE1NtRbrrKWyQPbeygP+Mg+IHyzA5cuCiTUe5X1hVkI7yjv8W9QB wIGI2N3o+RfGbpHXOrYBXjf4sSub3KLKri5zZYLHVsu19WZcQylTsFNxAaZc3/XzZSZVjY J6M/ArPOtF3xqvhTjHLe3Css1iAR6lY= X-MC-Unique: oH4s-2YSOFOCMT1B4sUgUw-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 10/10] iotests/300: Clean up pylint and mypy complaints Date: Thu, 14 Jan 2021 18:03:04 +0100 Message-Id: <20210114170304.87507-11-mreitz@redhat.com> In-Reply-To: <20210114170304.87507-1-mreitz@redhat.com> References: <20210114170304.87507-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@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=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/297 | 2 +- tests/qemu-iotests/300 | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297 index 1dce1d1b1c..03d8604538 100755 --- a/tests/qemu-iotests/297 +++ b/tests/qemu-iotests/297 @@ -33,7 +33,7 @@ SKIP_FILES =3D ( '218', '219', '222', '224', '228', '234', '235', '236', '237', '238', '240', '242', '245', '246', '248', '255', '256', '257', '258', '260', '262', '264', '266', '274', '277', '280', '281', '295', '296', '298', - '299', '300', '302', '303', '304', '307', + '299', '302', '303', '304', '307', 'nbd-fault-injector.py', 'qcow2.py', 'qcow2_format.py', 'qed.py' ) =20 diff --git a/tests/qemu-iotests/300 b/tests/qemu-iotests/300 index b864a21d5e..64d388a8fa 100755 --- a/tests/qemu-iotests/300 +++ b/tests/qemu-iotests/300 @@ -22,7 +22,11 @@ import os import random import re from typing import Dict, List, Optional, Union + import iotests + +# Import qemu after iotests.py has amended the PYTHONPATH +# pylint: disable=3Dwrong-import-order import qemu =20 BlockBitmapMapping =3D List[Dict[str, Union[str, List[Dict[str, str]]]]] @@ -110,10 +114,14 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): If @msg is None, check that there has not been any error. """ self.vm_b.shutdown() + + log =3D self.vm_b.get_log() + assert log is not None # Loaded after shutdown + if msg is None: - self.assertNotIn('qemu-system-', self.vm_b.get_log()) + self.assertNotIn('qemu-system-', log) else: - self.assertIn(msg, self.vm_b.get_log()) + self.assertIn(msg, log) =20 @staticmethod def mapping(node_name: str, node_alias: str, @@ -445,9 +453,13 @@ class TestBlockBitmapMappingErrors(TestDirtyBitmapMigr= ation): =20 # Check for the error in the source's log self.vm_a.shutdown() + + log =3D self.vm_a.get_log() + assert log is not None # Loaded after shutdown + self.assertIn(f"Cannot migrate bitmap '{name}' on node " f"'{self.src_node_name}': Name is longer than 255 by= tes", - self.vm_a.get_log()) + log) =20 # Expect abnormal shutdown of the destination VM because of # the failed migration --=20 2.29.2