From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
ehabkost@redhat.com, qemu-block@nongnu.org, philmd@redhat.com,
armbru@redhat.com, Max Reitz <mreitz@redhat.com>,
John Snow <jsnow@redhat.com>
Subject: [PATCH v8 10/11] iotests: Mark verify functions as private
Date: Mon, 16 Mar 2020 20:41:04 -0400 [thread overview]
Message-ID: <20200317004105.27059-11-jsnow@redhat.com> (raw)
In-Reply-To: <20200317004105.27059-1-jsnow@redhat.com>
Mark the verify functions as "private" with a leading underscore, to
discourage their use.
(Also, make pending patches not yet using the new entry points fail in a
very obvious way.)
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
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 ec7aa42a70..7d6cc430a4 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -988,7 +988,7 @@ def case_notrun(reason):
open('%s/%s.casenotrun' % (output_dir, seq), 'a').write(
' [case not run] ' + reason + '\n')
-def verify_image_format(supported_fmts=(), unsupported_fmts=()):
+def _verify_image_format(supported_fmts=(), unsupported_fmts=()):
assert not (supported_fmts and unsupported_fmts)
if 'generic' in supported_fmts and \
@@ -1002,7 +1002,7 @@ def verify_image_format(supported_fmts=(), unsupported_fmts=()):
if not_sup or (imgfmt in unsupported_fmts):
notrun('not suitable for this image format: %s' % imgfmt)
-def verify_protocol(supported=(), unsupported=()):
+def _verify_protocol(supported=(), unsupported=()):
assert not (supported and unsupported)
if 'generic' in supported:
@@ -1012,7 +1012,7 @@ def verify_protocol(supported=(), unsupported=()):
if not_sup or (imgproto in unsupported):
notrun('not suitable for this protocol: %s' % imgproto)
-def verify_platform(supported=(), unsupported=()):
+def _verify_platform(supported=(), unsupported=()):
if any((sys.platform.startswith(x) for x in unsupported)):
notrun('not suitable for this OS: %s' % sys.platform)
@@ -1020,11 +1020,11 @@ def verify_platform(supported=(), unsupported=()):
if not any((sys.platform.startswith(x) for x in supported)):
notrun('not suitable for this OS: %s' % sys.platform)
-def verify_cache_mode(supported_cache_modes=()):
+def _verify_cache_mode(supported_cache_modes=()):
if supported_cache_modes and (cachemode not in supported_cache_modes):
notrun('not suitable for this cache mode: %s' % cachemode)
-def verify_aio_mode(supported_aio_modes=()):
+def _verify_aio_mode(supported_aio_modes=()):
if supported_aio_modes and (aiomode not in supported_aio_modes):
notrun('not suitable for this aio mode: %s' % aiomode)
@@ -1151,11 +1151,11 @@ def execute_setup_common(supported_fmts: Collection[str] = (),
sys.stderr.write('Please run this test via the "check" script\n')
sys.exit(os.EX_USAGE)
- verify_image_format(supported_fmts, unsupported_fmts)
- verify_protocol(supported_protocols, unsupported_protocols)
- verify_platform(supported=supported_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=supported_platforms)
+ _verify_cache_mode(supported_cache_modes)
+ _verify_aio_mode(supported_aio_modes)
debug = '-d' in sys.argv
if debug:
--
2.21.1
next prev parent reply other threads:[~2020-03-17 0:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 0:40 [PATCH v8 00/11] iotests: use python logging John Snow
2020-03-17 0:40 ` [PATCH v8 01/11] iotests: do a light delinting John Snow
2020-03-24 13:56 ` Max Reitz
2020-03-17 0:40 ` [PATCH v8 02/11] iotests: don't use 'format' for drive_add John Snow
2020-03-17 0:40 ` [PATCH v8 03/11] iotests: ignore import warnings from pylint John Snow
2020-03-17 10:38 ` Philippe Mathieu-Daudé
2020-03-24 14:02 ` Max Reitz
2020-03-17 0:40 ` [PATCH v8 04/11] iotests: replace mutable list default args John Snow
2020-03-24 14:35 ` Max Reitz
2020-03-17 0:40 ` [PATCH v8 05/11] iotests: add pylintrc file John Snow
2020-03-24 14:47 ` Max Reitz
2020-03-17 0:41 ` [PATCH v8 06/11] iotests: drop Python 3.4 compatibility code John Snow
2020-03-24 14:54 ` Max Reitz
2020-03-24 16:57 ` John Snow
2020-03-17 0:41 ` [PATCH v8 07/11] iotests: limit line length to 79 chars John Snow
2020-03-17 10:36 ` Philippe Mathieu-Daudé
2020-03-17 13:48 ` John Snow
2020-03-24 15:02 ` Max Reitz
2020-03-24 15:12 ` Max Reitz
2020-03-24 17:09 ` John Snow
2020-03-24 17:38 ` Max Reitz
2020-03-17 0:41 ` [PATCH v8 08/11] iotests: add script_initialize John Snow
2020-03-17 0:41 ` [PATCH v8 09/11] iotest 258: use script_main John Snow
2020-03-17 0:41 ` John Snow [this message]
2020-03-17 0:41 ` [PATCH v8 11/11] iotests: use python logging for iotests.log() John Snow
2020-03-24 16:14 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200317004105.27059-11-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).