From nobody Mon Feb 9 17:06:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151370541425436.62275594149628; Tue, 19 Dec 2017 09:43:34 -0800 (PST) Received: from localhost ([::1]:56665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRLv7-00081z-MQ for importer@patchew.org; Tue, 19 Dec 2017 12:43:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRLoD-00026K-E9 for qemu-devel@nongnu.org; Tue, 19 Dec 2017 12:36:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRLoC-0001eK-97 for qemu-devel@nongnu.org; Tue, 19 Dec 2017 12:36:05 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:42345) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRLoC-0001eA-4M; Tue, 19 Dec 2017 12:36:04 -0500 Received: by mail-qt0-x244.google.com with SMTP id g9so25129568qth.9; Tue, 19 Dec 2017 09:36:04 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id z17sm9295525qti.59.2017.12.19.09.35.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Dec 2017 09:36:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+P95wyEjFhNaTEs6fyJ8B/+cLVLEsU52WY7R5PGysGI=; b=W12Tnl+fSSNydDTKyYij6rQpXldNUBnzTEFviPH3fyY+O9c9bzONhOdHnJO6gSfPa0 Sg38G8cfkJqRXv/Q/+i7mtwZq6ELuIBaqRjsXkoKzFRodJG4+vprvJSDEwjm0sgZFHGs 4elzvGTz/PkUXGe3uuQrJfNwqAF1gj0Yl3zAYja+5bmb5li4jIL28AlThdA2lOLHbiL2 451EzmHQwZe8JYnJpCnZSd2tO7dyybd7FtVzOJO0FGlSJ8m2Ka0qrv+htCayMEwnKBKy 8nnyJ31u+bwYIlbY+Nnun45TErin/c7soXbmAWp1I53Capj7nvUtw81hWPw0A8/52jZT MdXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+P95wyEjFhNaTEs6fyJ8B/+cLVLEsU52WY7R5PGysGI=; b=gvkNgmbFSzJgks2xZxFVm09OnYMousrHsUu94hgZ/VzCdrqGSiNn/AW4g6YbWYOJKZ 04uU2YfNwUax5NWiEqkcRLxCCbv/23QYZVmoUTIAVtvJyDVNHbmXJwVx2qR37ZYxzrbE 5atzIclpXxSE2wY5BLFOmqW0vN2cnQdrD9+9XUN1xaXTj0H8sYBepSWT/bBtyc5Di2oZ A1BHXqOHs1vW/MgU1K96jC30mt5L4US8RpeXut4zmlJhO/LjzwwKdgiYyJAKXMy8e1sS KLrnFb60MN2YUKdWBZyRNH6TSxLyzhYXUtTt3J//nIdRe1kgZXgO4bu7u99UHPNe3Wr/ 36MQ== X-Gm-Message-State: AKGB3mJCdc5JxIOIyJnhZy05LlpkrqnANa+gTLHNk3f4YF7WIcVtNAoE n0T6ttDI55Q8zmoFqkSZJPXiSzxOLJk= X-Google-Smtp-Source: ACJfBovB9UZ/WDIuAWxuAuCRCKsGDQcuWV2CMWycCyx1XAO5I5GowcDAx/enRg3LZDGd/sVYJ4kczA== X-Received: by 10.200.47.230 with SMTP id m35mr5677928qta.220.1513704963643; Tue, 19 Dec 2017 09:36:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Kevin Wolf , Max Reitz , Cleber Rosa , Eduardo Habkost , =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= , "Daniel P . Berrange" , Eric Blake , Stefan Hajnoczi , Fam Zheng , Markus Armbruster Date: Tue, 19 Dec 2017 14:34:24 -0300 Message-Id: <20171219173425.8113-9-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171219173425.8113-1-f4bug@amsat.org> References: <20171219173425.8113-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH 8/9] iotests: replace assertEquals() by assertEqual() for python3 compatibility X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Janosch Frank , qemu-block@nongnu.org, Nir Soffer , Ishani Chugh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrange --- tests/qemu-iotests/041 | 6 +++--- tests/qemu-iotests/118 | 4 ++-- tests/qemu-iotests/iotests.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index a860a31e9a..fa0f20af0e 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -457,7 +457,7 @@ new_state =3D "1" self.assert_qmp(result, 'return', {}) =20 event =3D self.vm.get_qmp_event(wait=3DTrue) - self.assertEquals(event['event'], 'BLOCK_JOB_ERROR') + self.assertEqual(event['event'], 'BLOCK_JOB_ERROR') self.assert_qmp(event, 'data/device', 'drive0') self.assert_qmp(event, 'data/operation', 'read') result =3D self.vm.qmp('query-block-jobs') @@ -478,7 +478,7 @@ new_state =3D "1" self.assert_qmp(result, 'return', {}) =20 event =3D self.vm.get_qmp_event(wait=3DTrue) - self.assertEquals(event['event'], 'BLOCK_JOB_ERROR') + self.assertEqual(event['event'], 'BLOCK_JOB_ERROR') self.assert_qmp(event, 'data/device', 'drive0') self.assert_qmp(event, 'data/operation', 'read') result =3D self.vm.qmp('query-block-jobs') @@ -609,7 +609,7 @@ new_state =3D "1" self.assert_qmp(result, 'return', {}) =20 event =3D self.vm.get_qmp_event(wait=3DTrue) - self.assertEquals(event['event'], 'BLOCK_JOB_ERROR') + self.assertEqual(event['event'], 'BLOCK_JOB_ERROR') self.assert_qmp(event, 'data/device', 'drive0') self.assert_qmp(event, 'data/operation', 'write') result =3D self.vm.qmp('query-block-jobs') diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118 index 3cf21218f0..8158b4bd25 100755 --- a/tests/qemu-iotests/118 +++ b/tests/qemu-iotests/118 @@ -295,7 +295,7 @@ class GeneralChangeTestsBaseClass(ChangeBaseClass): result =3D self.vm.qmp('blockdev-close-tray', device=3D'drive0') # Should be a no-op self.assert_qmp(result, 'return', {}) - self.assertEquals(self.vm.get_qmp_events(wait=3DFalse), []) + self.assertEqual(self.vm.get_qmp_events(wait=3DFalse), []) =20 def test_remove_on_closed(self): if not self.has_real_tray: @@ -476,7 +476,7 @@ class TestChangeReadOnly(ChangeBaseClass): read_only_mode=3D'r= etain') self.assert_qmp(result, 'error/class', 'GenericError') =20 - self.assertEquals(self.vm.get_qmp_events(wait=3DFalse), []) + self.assertEqual(self.vm.get_qmp_events(wait=3DFalse), []) =20 result =3D self.vm.qmp('query-block') self.assert_qmp(result, 'return[0]/inserted/ro', False) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 85c9d2c211..4c515d2e6c 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -385,7 +385,7 @@ class QMPTestCase(unittest.TestCase): def wait_ready_and_cancel(self, drive=3D'drive0'): self.wait_ready(drive=3Ddrive) event =3D self.cancel_and_wait(drive=3Ddrive) - self.assertEquals(event['event'], 'BLOCK_JOB_COMPLETED') + self.assertEqual(event['event'], 'BLOCK_JOB_COMPLETED') self.assert_qmp(event, 'data/type', 'mirror') self.assert_qmp(event, 'data/offset', event['data']['len']) =20 --=20 2.15.1