From nobody Sun Oct 5 21:15:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 155110819502956.466909449438276; Mon, 25 Feb 2019 07:23:15 -0800 (PST) Received: from localhost ([127.0.0.1]:38985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyI62-0000yC-Si for importer@patchew.org; Mon, 25 Feb 2019 10:23:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyI3u-0007sT-5h for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:20:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyI3o-0000DH-D3 for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:20:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43574) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyI3X-0008Jt-QJ; Mon, 25 Feb 2019 10:20:38 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB54730A9966; Mon, 25 Feb 2019 15:20:18 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-222.phx2.redhat.com [10.3.116.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB535600C8; Mon, 25 Feb 2019 15:20:17 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 25 Feb 2019 09:20:13 -0600 Message-Id: <20190225152015.26089-2-eblake@redhat.com> In-Reply-To: <20190225152015.26089-1-eblake@redhat.com> References: <20190225152015.26089-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 25 Feb 2019 15:20:19 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/3] iotests: handle TypeError for Python3 in test 242 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , "open list:Block layer core" , Max Reitz , Cleber Rosa , Andrey Shinkevich Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Andrey Shinkevich The data type for bytes in Python3 differs from the one in Python2. Those cases should be managed separately. Signed-off-by: Andrey Shinkevich Reported-by: Kevin Wolf Message-Id: <1550834773-873512-1-git-send-email-andrey.shinkevich@virtuozzo= .com> Reviewed-by: Eric Blake Reviewed-by: Cleber Rosa Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Eric Blake --- tests/qemu-iotests/242 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242 index 16c65edcd7f..446fbf8ea13 100755 --- a/tests/qemu-iotests/242 +++ b/tests/qemu-iotests/242 @@ -20,6 +20,7 @@ import iotests import json +import sys from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \ file_path, img_info_log, log, filter_qemu_io @@ -65,9 +66,12 @@ def toggle_flag(offset): with open(disk, "r+b") as f: f.seek(offset, 0) c =3D f.read(1) - toggled =3D chr(ord(c) ^ bitmap_flag_unknown) + toggled =3D ord(c) ^ bitmap_flag_unknown f.seek(-1, 1) - f.write(toggled) + if sys.version_info.major >=3D 3: + f.write(bytes([toggled])) + else: + f.write(chr(toggled)) qemu_img_create('-f', iotests.imgfmt, disk, '1M') --=20 2.20.1