From nobody Thu Dec 18 13:28:38 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650896494609661.6786096158676; Mon, 25 Apr 2022 07:21:34 -0700 (PDT) Received: from localhost ([::1]:44996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nizan-0002gi-Ke for importer@patchew.org; Mon, 25 Apr 2022 10:21:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nizOJ-00055P-1D for qemu-devel@nongnu.org; Mon, 25 Apr 2022 10:08:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:48752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nizOH-0001yh-6q for qemu-devel@nongnu.org; Mon, 25 Apr 2022 10:08:38 -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-628-ioSka_RzPBavRgEKZChWDg-1; Mon, 25 Apr 2022 10:08:35 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 913D3811E78; Mon, 25 Apr 2022 14:08:34 +0000 (UTC) Received: from localhost (unknown [10.39.194.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B517400F8F6; Mon, 25 Apr 2022 14:08:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650895716; 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=FzFgDRpsqWvATTHZbBNfuBzm7uWVHHVkHtNIloMnHVs=; b=Z9cZOrOxnFj5aUPnPYBjNm0p4xKd+gx1pgfSD/PX5RrSOY1Mk2sZtGQO7uOSkHXPCZDClx w6PFwGxv7pCxmeB6eJEgvi0zvH8rfDeeD/4AJgYvi4NarcxKVukhE69b9lzIZ9AX+l5Hwz K8RjfwbubVm1/YF8jmiWDSW/4yneOdE= X-MC-Unique: ioSka_RzPBavRgEKZChWDg-1 From: Hanna Reitz To: qemu-block@nongnu.org Subject: [PULL 07/14] iotests: create generic qemu_tool() function Date: Mon, 25 Apr 2022 16:08:14 +0200 Message-Id: <20220425140821.957511-8-hreitz@redhat.com> In-Reply-To: <20220425140821.957511-1-hreitz@redhat.com> References: <20220425140821.957511-1-hreitz@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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.133.124; envelope-from=hreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 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_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: Peter Maydell , Hanna Reitz , Richard Henderson , qemu-devel@nongnu.org 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: 1650896495286100001 Content-Type: text/plain; charset="utf-8" From: John Snow reimplement qemu_img() in terms of qemu_tool() in preparation for doing the same with qemu_io(). Signed-off-by: John Snow Reviewed-by: Eric Blake Reviewed-by: Hanna Reitz Message-Id: <20220418211504.943969-7-jsnow@redhat.com> Signed-off-by: Hanna Reitz --- tests/qemu-iotests/iotests.py | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 33a44671aa..6800c67bea 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -206,15 +206,13 @@ def qemu_img_create_prepare_args(args: List[str]) -> = List[str]: =20 return result =20 -def qemu_img(*args: str, check: bool =3D True, combine_stdio: bool =3D True - ) -> 'subprocess.CompletedProcess[str]': - """ - Run qemu_img and return the status code and console output. =20 - This function always prepends QEMU_IMG_OPTIONS and may further alter - the args for 'create' commands. +def qemu_tool(*args: str, check: bool =3D True, combine_stdio: bool =3D Tr= ue + ) -> 'subprocess.CompletedProcess[str]': + """ + Run a qemu tool and return its status code and console output. =20 - :param args: command-line arguments to qemu-img. + :param args: full command line to run. :param check: Enforce a return code of zero. :param combine_stdio: set to False to keep stdout/stderr separated. =20 @@ -231,10 +229,8 @@ def qemu_img(*args: str, check: bool =3D True, combine= _stdio: bool =3D True properties. If streams are not combined, it will also have a stderr property. """ - full_args =3D qemu_img_args + qemu_img_create_prepare_args(list(args)) - subp =3D subprocess.run( - full_args, + args, stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.STDOUT if combine_stdio else subprocess.PIPE, universal_newlines=3DTrue, @@ -243,7 +239,7 @@ def qemu_img(*args: str, check: bool =3D True, combine_= stdio: bool =3D True =20 if check and subp.returncode or (subp.returncode < 0): raise VerboseProcessError( - subp.returncode, full_args, + subp.returncode, args, output=3Dsubp.stdout, stderr=3Dsubp.stderr, ) @@ -251,6 +247,20 @@ def qemu_img(*args: str, check: bool =3D True, combine= _stdio: bool =3D True return subp =20 =20 +def qemu_img(*args: str, check: bool =3D True, combine_stdio: bool =3D True + ) -> 'subprocess.CompletedProcess[str]': + """ + Run QEMU_IMG_PROG and return its status code and console output. + + This function always prepends QEMU_IMG_OPTIONS and may further alter + the args for 'create' commands. + + See `qemu_tool()` for greater detail. + """ + full_args =3D qemu_img_args + qemu_img_create_prepare_args(list(args)) + return qemu_tool(*full_args, check=3Dcheck, combine_stdio=3Dcombine_st= dio) + + def ordered_qmp(qmsg, conv_keys=3DTrue): # Dictionaries are not ordered prior to 3.6, therefore: if isinstance(qmsg, list): --=20 2.35.1