From patchwork Tue Oct 1 19:47:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 1170265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46jXkY6DtBz9sPL for ; Wed, 2 Oct 2019 07:40:37 +1000 (AEST) Received: from localhost ([::1]:48444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFPso-00042y-J6 for incoming@patchwork.ozlabs.org; Tue, 01 Oct 2019 17:40:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55472) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO9N-0006Oc-32 for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO9K-0000JH-QN for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60218) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO9I-0000Ho-8p; Tue, 01 Oct 2019 15:49:28 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 88B3E18C427F; Tue, 1 Oct 2019 19:49:27 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E16D1001B05; Tue, 1 Oct 2019 19:49:26 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 56/67] iotests/242: Honor $IMGOPTS Date: Tue, 1 Oct 2019 21:47:04 +0200 Message-Id: <20191001194715.2796-57-mreitz@redhat.com> In-Reply-To: <20191001194715.2796-1-mreitz@redhat.com> References: <20191001194715.2796-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Tue, 01 Oct 2019 19:49:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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 , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Max Reitz --- tests/qemu-iotests/242 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242 index 333fb8b56c..bccd8a9fdf 100755 --- a/tests/qemu-iotests/242 +++ b/tests/qemu-iotests/242 @@ -21,14 +21,14 @@ import iotests import json import struct -from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \ - file_path, img_info_log, log, filter_qemu_io +from iotests import create_test_image, remove_test_image, qemu_io, \ + qemu_img_pipe, image_path, img_info_log, log, filter_qemu_io iotests.script_initialize(supported_fmts=['qcow2'], # compat=1.1 is needed for dirty bitmaps unsupported_imgopts=['compat=0.10']) -disk = file_path('disk') +disk = image_path('disk') chunk = 256 * 1024 bitmap_flag_unknown = 1 << 2 # flag_offset = 5*cluster_size + flag_offset_in_bitmap_directory_entry @@ -74,7 +74,7 @@ def toggle_flag(offset): f.write(struct.pack("B", toggled)) -qemu_img_create('-f', iotests.imgfmt, disk, '1M') +create_test_image(disk, '1M') for num in range(1, 4): disabled = False @@ -95,7 +95,8 @@ vm.shutdown() num += 1 log('\nTest {}'.format(num)) -qemu_img_create('-f', iotests.imgfmt, disk, '1M') +remove_test_image(disk) +create_test_image(disk, '1M') add_bitmap(1, True, False) log('Write an unknown bitmap flag \'{}\' into a new QCOW2 image at offset {}' .format(hex(bitmap_flag_unknown), flag_offset))