From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:35150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvp58-0006Gm-4I for qemu-devel@nongnu.org; Mon, 18 Feb 2019 15:00:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvp57-0007am-Ci for qemu-devel@nongnu.org; Mon, 18 Feb 2019 15:00:02 -0500 From: Andrey Shinkevich Date: Mon, 18 Feb 2019 22:59:57 +0300 Message-Id: <1550519997-253534-1-git-send-email-andrey.shinkevich@virtuozzo.com> Subject: [Qemu-devel] [PATCH] iotests: handle TypeError for Python3 in test 242 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: eblake@redhat.com, mreitz@redhat.com, kwolf@redhat.com, den@openvz.org, vsementsov@virtuozzo.com, andrey.shinkevich@virtuozzo.com To write one byte to disk, Python2 may use 'chr' type. In Python3, conversion to 'byte' type is required. Signed-off-by: Andrey Shinkevich --- tests/qemu-iotests/242 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242 index 16c65ed..6b1f7b8 100755 --- a/tests/qemu-iotests/242 +++ b/tests/qemu-iotests/242 @@ -65,9 +65,14 @@ def toggle_flag(offset): with open(disk, "r+b") as f: f.seek(offset, 0) c = f.read(1) - toggled = chr(ord(c) ^ bitmap_flag_unknown) + toggled = ord(c) ^ bitmap_flag_unknown f.seek(-1, 1) - f.write(toggled) + try: + # python2 + f.write(chr(toggled)) + except TypeError: + # python3 + f.write(bytes([toggled])) qemu_img_create('-f', iotests.imgfmt, disk, '1M') -- 1.8.3.1