From nobody Sat Feb 7 10:15:57 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=1589406279; cv=none; d=zohomail.com; s=zohoarc; b=DWXjUE0/Rc3wuxPlU7dKoalb28bnUOBMiGDGfEz7Wqv+qdaLAbptWHd1fTcO2a1yktviw7f7O5GM1ht8Oo0YeFAxEQ0RNGENY0TatYp97/aENrLl+fmBREkQiXhAT+sxcJom4pbg0B2Fwqj13kJd6ShGT7a7VcsWU6i9zwyX8LU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589406279; 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=kXoCwbk+3HXyEFBiiOU0vwvD6R17WSdenHb1GicYPzY=; b=l5D79fm+nKpeeQG8gORCnBzN221g9g+2vArmsYc9sZoMm16kE3nxITsXqH8V2pxJq46PrHGSqvZ4GyUt+N69uNOIDZb0EbiRPY67Xobxknh/cQ3IOu8s3BzbUlyoGgZPOJ0oq9d3lKLVXjMxMp40res+4UAEBUNUD93e1u/t8MU= 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 1589406279974274.95647700168536; Wed, 13 May 2020 14:44:39 -0700 (PDT) Received: from localhost ([::1]:48684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYzB8-0001Au-Hu for importer@patchew.org; Wed, 13 May 2020 17:44:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYz8F-0006re-Ip for qemu-devel@nongnu.org; Wed, 13 May 2020 17:41:39 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34531 helo=us-smtp-delivery-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 1jYz8E-0005a5-5w for qemu-devel@nongnu.org; Wed, 13 May 2020 17:41:38 -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-470-fMQ1shCZOFaNvBsxlgv9Pw-1; Wed, 13 May 2020 17:41:33 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DD834801503; Wed, 13 May 2020 21:41:32 +0000 (UTC) Received: from probe.redhat.com (ovpn-113-80.rdu2.redhat.com [10.10.113.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BEB21C94D; Wed, 13 May 2020 21:41:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589406096; 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=kXoCwbk+3HXyEFBiiOU0vwvD6R17WSdenHb1GicYPzY=; b=dXGVCZM8SuMtSgKjgdZR1uhxlQugFnlfStQxsPiMET4xQiBsHR0CpmD9eJG/YyJL4KEWiJ QAGviX6LiokLaY+Tc2SQoPCT/moOXOYX6p3GG3yxrn2EoXeqZtCRo66+FsUorem/y6jMRf 1cbC4FMzapqqzZF12PP0/RzFcP6svvA= X-MC-Unique: fMQ1shCZOFaNvBsxlgv9Pw-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH RFC WIP 1/6] iotests: type hint wip Date: Wed, 13 May 2020 17:41:25 -0400 Message-Id: <20200513214130.15375-2-jsnow@redhat.com> In-Reply-To: <20200513214130.15375-1-jsnow@redhat.com> References: <20200513214130.15375-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=205.139.110.61; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 01:56:38 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , ehabkost@redhat.com, qemu-block@nongnu.org, philmd@redhat.com, Max Reitz , John Snow 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" Signed-off-by: John Snow --- tests/qemu-iotests/iotests.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 6c0e781af7..27c477c8a7 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -90,7 +90,7 @@ luks_default_key_secret_opt =3D 'key-secret=3Dkeysec0' =20 =20 -def qemu_img(*args): +def qemu_img(*args) -> int: '''Run qemu-img and return the exit code''' devnull =3D open('/dev/null', 'r+') exitcode =3D subprocess.call(qemu_img_args + list(args), @@ -113,24 +113,24 @@ def ordered_qmp(qmsg, conv_keys=3DTrue): return od return qmsg =20 -def qemu_img_create(*args): - args =3D list(args) +def qemu_img_create(*args: str) -> int: + qargs =3D list(args) =20 # default luks support - if '-f' in args and args[args.index('-f') + 1] =3D=3D 'luks': - if '-o' in args: - i =3D args.index('-o') - if 'key-secret' not in args[i + 1]: - args[i + 1].append(luks_default_key_secret_opt) - args.insert(i + 2, '--object') - args.insert(i + 3, luks_default_secret_object) + if '-f' in qargs and qargs[qargs.index('-f') + 1] =3D=3D 'luks': + if '-o' in qargs: + i =3D qargs.index('-o') + if 'key-secret' not in qargs[i + 1]: + qargs[i + 1].append(luks_default_key_secret_opt) + qargs.insert(i + 2, '--object') + qargs.insert(i + 3, luks_default_secret_object) else: - args =3D ['-o', luks_default_key_secret_opt, - '--object', luks_default_secret_object] + args + qargs =3D ['-o', luks_default_key_secret_opt, + '--object', luks_default_secret_object] + qargs =20 - args.insert(0, 'create') + qargs.insert(0, 'create') =20 - return qemu_img(*args) + return qemu_img(*qargs) =20 def qemu_img_verbose(*args): '''Run qemu-img without suppressing its output and return the exit cod= e''' --=20 2.21.1