From nobody Mon Feb 9 00:43:15 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 ARC-Seal: i=1; a=rsa-sha256; t=1599503788; cv=none; d=zohomail.com; s=zohoarc; b=mB9mH9ZoYxEUazPZU5RtugSB9H9EHxKSCtRPAZmqYx0GSAYmFP+apTBryF9NTD7oPdCR2Vz5skcYS0+um/u+cw+p1bY0nJoZGKwjLzO3csfAfcnw8nhm/3qm2joLy63BgE3mZlVte/sAya03Zflsf+MOwS0u4QwxAwqs15hf6R8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599503788; 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=VeREhGKP4J/mxzvLAwobuXCNSXXlxfgXvwESJhQQF9k=; b=fmvbXxVyWo8tKnPSxZcPTBU8jTMOV8a78aEbO/jmB/E3eWnw24Pe/qtk5jIHNKS0zejAhn785dXIv2Xte1VplLVZwwl5EwAYOH+4YrRELJpi2BHYmw4DUOOU/nRPNKV4rlo6kZS9u90/qtaq/2llLbvsHphuwU80p0ODfjvL8dQ= 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 1599503788989187.06284038882131; Mon, 7 Sep 2020 11:36:28 -0700 (PDT) Received: from localhost ([::1]:45452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFM0B-0000ym-NT for importer@patchew.org; Mon, 07 Sep 2020 14:36:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFLlR-0006Aa-60 for qemu-devel@nongnu.org; Mon, 07 Sep 2020 14:21:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54394 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kFLlP-0004hr-1V for qemu-devel@nongnu.org; Mon, 07 Sep 2020 14:21:12 -0400 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-63-C4llnZdEPoGfic6GN7Np6Q-1; Mon, 07 Sep 2020 14:21:05 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 650B3425CD; Mon, 7 Sep 2020 18:21:04 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-154.ams2.redhat.com [10.36.114.154]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AF1C60BF3; Mon, 7 Sep 2020 18:21:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599502870; 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=VeREhGKP4J/mxzvLAwobuXCNSXXlxfgXvwESJhQQF9k=; b=hiAy/Or1jKaAUSSQiX+MQ+1OqhephaqzYdJSzvq5Bw7uJQXKviKQspT5CjMtEjO+EjrFMc AbMTEo82LROnEZ4B4i+UZufwPfdi13jH5A22QRIl1VxrraZaKXQujzo7+1rgaN//F+Ys1N TLe+yzUSm7RG6oVGKB3kW6RQeHDV9ZU= X-MC-Unique: C4llnZdEPoGfic6GN7Np6Q-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 28/29] iotests: Factor out qemu_tool_pipe_and_status() Date: Mon, 7 Sep 2020 20:20:10 +0200 Message-Id: <20200907182011.521007-29-kwolf@redhat.com> In-Reply-To: <20200907182011.521007-1-kwolf@redhat.com> References: <20200907182011.521007-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0.001 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=207.211.31.120; envelope-from=kwolf@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/07 02:54:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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.1, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com 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" We have three almost identical functions that call an external process and return its output and return code. Refactor them into small wrappers around a common function. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- tests/qemu-iotests/iotests.py | 50 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 64ccaf9061..6fed77487e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -90,21 +90,30 @@ luks_default_secret_object =3D 'secret,id=3Dkeysec0,dat= a=3D' + \ luks_default_key_secret_opt =3D 'key-secret=3Dkeysec0' =20 =20 -def qemu_img_pipe_and_status(*args: str) -> Tuple[str, int]: +def qemu_tool_pipe_and_status(tool: str, *args: str, + connect_stderr: bool =3D True) -> Tuple[str,= int]: """ - Run qemu-img and return both its output and its exit code + Run a tool and return both its output and its exit code """ - subp =3D subprocess.Popen(qemu_img_args + list(args), + stderr =3D subprocess.STDOUT if connect_stderr else None + subp =3D subprocess.Popen(args, stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.STDOUT, + stderr=3Dstderr, universal_newlines=3DTrue) output =3D subp.communicate()[0] if subp.returncode < 0: - sys.stderr.write('qemu-img received signal %i: %s\n' - % (-subp.returncode, + sys.stderr.write('%s received signal %i: %s\n' + % (tool, -subp.returncode, ' '.join(qemu_img_args + list(args)))) return (output, subp.returncode) =20 +def qemu_img_pipe_and_status(*args: str) -> Tuple[str, int]: + """ + Run qemu-img and return both its output and its exit code + """ + full_args =3D qemu_img_args + list(args) + return qemu_tool_pipe_and_status('qemu-img', *full_args) + def qemu_img(*args: str) -> int: '''Run qemu-img and return the exit code''' return qemu_img_pipe_and_status(*args)[1] @@ -265,19 +274,14 @@ def qemu_nbd(*args): '''Run qemu-nbd in daemon mode and return the parent's exit code''' return subprocess.call(qemu_nbd_args + ['--fork'] + list(args)) =20 -def qemu_nbd_early_pipe(*args): +def qemu_nbd_early_pipe(*args: str) -> Tuple[int, str]: '''Run qemu-nbd in daemon mode and return both the parent's exit code and its output in case of an error''' - subp =3D subprocess.Popen(qemu_nbd_args + ['--fork'] + list(args), - stdout=3Dsubprocess.PIPE, - universal_newlines=3DTrue) - output =3D subp.communicate()[0] - if subp.returncode < 0: - sys.stderr.write('qemu-nbd received signal %i: %s\n' % - (-subp.returncode, - ' '.join(qemu_nbd_args + ['--fork'] + list(args)= ))) - - return subp.returncode, output if subp.returncode else '' + full_args =3D qemu_nbd_args + ['--fork'] + list(args) + output, returncode =3D qemu_tool_pipe_and_status('qemu-nbd', + connect_stderr=3DFalse, + *full_args) + return returncode, output if returncode else '' =20 @contextmanager def qemu_nbd_popen(*args): @@ -1140,20 +1144,14 @@ def verify_working_luks(): if not working: notrun(reason) =20 -def qemu_pipe(*args): +def qemu_pipe(*args: str) -> str: """ Run qemu with an option to print something and exit (e.g. a help optio= n). =20 :return: QEMU's stdout output. """ - args =3D [qemu_prog] + qemu_opts + list(args) - subp =3D subprocess.Popen(args, stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.STDOUT, - universal_newlines=3DTrue) - output =3D subp.communicate()[0] - if subp.returncode < 0: - sys.stderr.write('qemu received signal %i: %s\n' % - (-subp.returncode, ' '.join(args))) + full_args =3D [qemu_prog] + qemu_opts + list(args) + output, _ =3D qemu_tool_pipe_and_status('qemu', *full_args) return output =20 def supported_formats(read_only=3DFalse): --=20 2.25.4