From nobody Mon Feb 9 11:06:05 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647561644501933.1151705180629; Thu, 17 Mar 2022 17:00:44 -0700 (PDT) Received: from localhost ([::1]:40622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nV02t-0002Fm-HV for importer@patchew.org; Thu, 17 Mar 2022 20:00:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUzsX-0001jX-3K for qemu-devel@nongnu.org; Thu, 17 Mar 2022 19:50:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:41860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUzsQ-0005gb-Ce for qemu-devel@nongnu.org; Thu, 17 Mar 2022 19:50:00 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-101-Af7glk1fPZOajewgRnncag-1; Thu, 17 Mar 2022 19:49:47 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 31EA0811E76; Thu, 17 Mar 2022 23:49:47 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.32.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA948112C256; Thu, 17 Mar 2022 23:49:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647560990; 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=r6IeVXe7x3wXprRtWHJqnXcH96E8o17MoSIRtYXD/yM=; b=P5IpsAFjSVu7rbuAGAnFmMS3rhiJjOhoVBMSe60QNgev3qMzky6YA8iSDSyKUvnPddAsRQ GCijQGz344w6HKnKfuAG9O3ibsU5pOQfi+45VKgngrS9VVjQ/cyxaMvw0wthkjrnoSW0nM 4sgC/3vET3krowjwcoiPLltF/ZK5o34= X-MC-Unique: Af7glk1fPZOajewgRnncag-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v4 11/18] iotests: change supports_quorum to use qemu_img Date: Thu, 17 Mar 2022 19:49:30 -0400 Message-Id: <20220317234937.569525-12-jsnow@redhat.com> In-Reply-To: <20220317234937.569525-1-jsnow@redhat.com> References: <20220317234937.569525-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@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=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Beraldo Leal , qemu-block@nongnu.org, John Snow , Hanna Reitz , Cleber Rosa , Eric Blake Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647561645914100001 Content-Type: text/plain; charset="utf-8" Similar to other recent changes: use the qemu_img() invocation that supports throwing loud, nasty exceptions when it fails for surprising reasons. (Why would "--help" ever fail? I don't know, but eliminating *all* calls to qemu-img that do not go through qemu_img() is my goal, so qemu_img_pipe() has to be removed.) Signed-off-by: John Snow Reviewed-by: Hanna Reitz --- tests/qemu-iotests/iotests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 58fb1734b5..17065fc176 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -1427,8 +1427,8 @@ def _verify_imgopts(unsupported: Sequence[str] =3D ()= ) -> None: notrun(f'not suitable for this imgopts: {imgopts}') =20 =20 -def supports_quorum(): - return 'quorum' in qemu_img_pipe('--help') +def supports_quorum() -> bool: + return 'quorum' in qemu_img('--help').stdout =20 def verify_quorum(): '''Skip test suite if quorum support is not available''' --=20 2.34.1