From nobody Fri Dec 19 19:55:15 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=1608306195; cv=none; d=zohomail.com; s=zohoarc; b=D8Vcgok1Cl9eDwUF872ZNkD1bPiNU1mKdilWEduYhw3FdQMnDjwvfX9W3ul71J2zZeieuxO0poNuCWz74cHXW3mWxZN4fc+BG/aqWiE14fsXW/jSivyJB261mjPlDmBbzi6J1Sl4rMSzUnN5CPc4kc3GvWKj98kiD67pMSSBBX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608306195; 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=nePBOte7Ef+Q0kbPVIXSFIsfmlBHc73YjzfApsE4dMg=; b=mPeneEtO1Sn2scFQ6xVcIgTZfs6GmIGFUl0IVslDOEefdvj0oZlCa92TBLX2aSGpCB6mOxCP/59qlhxwPOUAAwfvOGuhEfu/fbC+z03KbcAF5WRw/k5iNnVOU5SB4yY/cLjhJhzguFHLx5LpeyBVNONyXgv3/CTkzF6umTiHfmc= 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 1608306195628116.10896374396202; Fri, 18 Dec 2020 07:43:15 -0800 (PST) Received: from localhost ([::1]:41786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqHcB-0006pq-2X for importer@patchew.org; Fri, 18 Dec 2020 10:24:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqHRp-0002Yc-Ho for qemu-devel@nongnu.org; Fri, 18 Dec 2020 10:13:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54276) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kqHRh-0005Ov-4z for qemu-devel@nongnu.org; Fri, 18 Dec 2020 10:13:37 -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-263-j73iKH7bNM2YXS5UFte4xA-1; Fri, 18 Dec 2020 10:13:25 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id EFF1B190B2A0; Fri, 18 Dec 2020 15:13:23 +0000 (UTC) Received: from localhost (ovpn-114-84.ams2.redhat.com [10.36.114.84]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 963042BFF1; Fri, 18 Dec 2020 15:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608304408; 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=nePBOte7Ef+Q0kbPVIXSFIsfmlBHc73YjzfApsE4dMg=; b=K/hCiypTJ5BpbXnKikUlUUhtEes0czR1AS5r8mtXc5aWTdI8L0x6pn0N+dmh8xm95J4/Iv okU187EQGSYNK1VAhIfO6L9PrtTUECIlmKUI2TvGclj1vror1SBacqPlKxeoQnbsl8ivpU Jn2Lwue74V7W4o6aG2z/cFX/I3SQB48= X-MC-Unique: j73iKH7bNM2YXS5UFte4xA-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 14/30] iotests: qemu_io_silent: support --image-opts Date: Fri, 18 Dec 2020 16:12:33 +0100 Message-Id: <20201218151249.715731-15-mreitz@redhat.com> In-Reply-To: <20201218151249.715731-1-mreitz@redhat.com> References: <20201218151249.715731-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=216.205.24.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 , Peter Maydell , 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" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz Message-Id: <20201021145859.11201-11-vsementsov@virtuozzo.com> Signed-off-by: Max Reitz --- tests/qemu-iotests/iotests.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index bcd4fe5b6f..1b7f376348 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -205,7 +205,12 @@ def qemu_io_log(*args): =20 def qemu_io_silent(*args): '''Run qemu-io and return the exit code, suppressing stdout''' - args =3D qemu_io_args + list(args) + if '-f' in args or '--image-opts' in args: + default_args =3D qemu_io_args_no_fmt + else: + default_args =3D qemu_io_args + + args =3D default_args + list(args) exitcode =3D subprocess.call(args, stdout=3Dopen('/dev/null', 'w')) if exitcode < 0: sys.stderr.write('qemu-io received signal %i: %s\n' % --=20 2.29.2