From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E5ADC3F2CE for ; Wed, 4 Mar 2020 21:44:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 37E7C20838 for ; Wed, 4 Mar 2020 21:44:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OpH2Strq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37E7C20838 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9boH-0005v2-Dp for qemu-devel@archiver.kernel.org; Wed, 04 Mar 2020 16:44:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52281) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9biv-0006QZ-L1 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 16:38:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9biu-0007ej-E5 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 16:38:37 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:22691 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9biu-0007eA-AD for qemu-devel@nongnu.org; Wed, 04 Mar 2020 16:38:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583357916; 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=Gm8Rcew3uqPWai8J1AsFI5cDh1D3t1MmZjhQQdM2Bs0=; b=OpH2StrqGZYDc1sYtBYUmnio86BqeMJ/rm4xGN1Uq7UFqE2Kh3jOSRMwzYjVjCb9To91w5 P0XzA+IYkpG2H/wfyKlO2ppwO/X4v3CMD3zRtgoPMH+VbpMLTSpvFryID/3NaLHwG1aHVE H92N9zCtEldtmLlw2xnXb3MugXOnUxM= 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-254-gIILfxXtPcqqDl6qH4YcZQ-1; Wed, 04 Mar 2020 16:38:34 -0500 X-MC-Unique: gIILfxXtPcqqDl6qH4YcZQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 59DA713E6; Wed, 4 Mar 2020 21:38:33 +0000 (UTC) Received: from probe.redhat.com (ovpn-120-212.rdu2.redhat.com [10.10.120.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64A405C1D4; Wed, 4 Mar 2020 21:38:32 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v7 09/10] iotests: Mark verify functions as private Date: Wed, 4 Mar 2020 16:38:17 -0500 Message-Id: <20200304213818.15341-10-jsnow@redhat.com> In-Reply-To: <20200304213818.15341-1-jsnow@redhat.com> References: <20200304213818.15341-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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 , qemu-block@nongnu.org, armbru@redhat.com, Max Reitz , John Snow , philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Discourage their use. (Also, make pending patches not yet using the new entry points fail in a very obvious way.) Reviewed-by: Max Reitz Signed-off-by: John Snow --- tests/qemu-iotests/iotests.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 1f88d2fa2a..23678f2daa 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -982,7 +982,7 @@ def case_notrun(reason): open('%s/%s.casenotrun' % (output_dir, seq), 'a').write( ' [case not run] ' + reason + '\n') =20 -def verify_image_format(supported_fmts=3D(), unsupported_fmts=3D()): +def _verify_image_format(supported_fmts=3D(), unsupported_fmts=3D()): assert not (supported_fmts and unsupported_fmts) =20 if 'generic' in supported_fmts and \ @@ -996,7 +996,7 @@ def verify_image_format(supported_fmts=3D(), unsupporte= d_fmts=3D()): if not_sup or (imgfmt in unsupported_fmts): notrun('not suitable for this image format: %s' % imgfmt) =20 -def verify_protocol(supported=3D(), unsupported=3D()): +def _verify_protocol(supported=3D(), unsupported=3D()): assert not (supported and unsupported) =20 if 'generic' in supported: @@ -1006,7 +1006,7 @@ def verify_protocol(supported=3D(), unsupported=3D())= : if not_sup or (imgproto in unsupported): notrun('not suitable for this protocol: %s' % imgproto) =20 -def verify_platform(supported=3D(), unsupported=3D()): +def _verify_platform(supported=3D(), unsupported=3D()): if any((sys.platform.startswith(x) for x in unsupported)): notrun('not suitable for this OS: %s' % sys.platform) =20 @@ -1014,11 +1014,11 @@ def verify_platform(supported=3D(), unsupported=3D(= )): if not any((sys.platform.startswith(x) for x in supported)): notrun('not suitable for this OS: %s' % sys.platform) =20 -def verify_cache_mode(supported_cache_modes=3D()): +def _verify_cache_mode(supported_cache_modes=3D()): if supported_cache_modes and (cachemode not in supported_cache_modes): notrun('not suitable for this cache mode: %s' % cachemode) =20 -def verify_aio_mode(supported_aio_modes=3D()): +def _verify_aio_mode(supported_aio_modes=3D()): if supported_aio_modes and (aiomode not in supported_aio_modes): notrun('not suitable for this aio mode: %s' % aiomode) =20 @@ -1145,11 +1145,11 @@ def execute_setup_common(supported_fmts: Collection= [str] =3D (), sys.stderr.write('Please run this test via the "check" script\n') sys.exit(os.EX_USAGE) =20 - verify_image_format(supported_fmts, unsupported_fmts) - verify_protocol(supported_protocols, unsupported_protocols) - verify_platform(supported=3Dsupported_platforms) - verify_cache_mode(supported_cache_modes) - verify_aio_mode(supported_aio_modes) + _verify_image_format(supported_fmts, unsupported_fmts) + _verify_protocol(supported_protocols, unsupported_protocols) + _verify_platform(supported=3Dsupported_platforms) + _verify_cache_mode(supported_cache_modes) + _verify_aio_mode(supported_aio_modes) =20 debug =3D '-d' in sys.argv if debug: --=20 2.21.1