From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Thomas Huth <thuth@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>,
John Snow <jsnow@redhat.com>
Subject: [Qemu-devel] [PATCH v4 3/7] iotests: Use case_skip() in skip_if_unsupported()
Date: Tue, 17 Sep 2019 11:20:00 +0200 [thread overview]
Message-ID: <20190917092004.999-4-mreitz@redhat.com> (raw)
In-Reply-To: <20190917092004.999-1-mreitz@redhat.com>
skip_if_unsupported() should use the stronger variant case_skip(),
because this allows it to be used even with setUp() (in a meaningful
way).
In the process, make it explicit what we expect the first argument of
the func_wrapper to be (namely something derived of QMPTestCase).
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/iotests.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index e46f3b6aed..427c34697a 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -893,14 +893,14 @@ def skip_if_unsupported(required_formats=[], read_only=False):
'''Skip Test Decorator
Runs the test if all the required formats are whitelisted'''
def skip_test_decorator(func):
- def func_wrapper(*args, **kwargs):
+ def func_wrapper(test_case: QMPTestCase, *args, **kwargs):
usf_list = list(set(required_formats) -
set(supported_formats(read_only)))
if usf_list:
- case_notrun('{}: formats {} are not whitelisted'.format(
- args[0], usf_list))
+ test_case.case_skip('{}: formats {} are not whitelisted'.format(
+ test_case, usf_list))
else:
- return func(*args, **kwargs)
+ return func(test_case, *args, **kwargs)
return func_wrapper
return skip_test_decorator
--
2.21.0
next prev parent reply other threads:[~2019-09-17 9:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 9:19 [Qemu-devel] [PATCH v4 0/7] iotests: Selfish patches Max Reitz
2019-09-17 9:19 ` [Qemu-devel] [PATCH v4 1/7] iotests: Prefer null-co over null-aio Max Reitz
2019-09-17 10:35 ` Andrey Shinkevich
2019-09-17 9:19 ` [Qemu-devel] [PATCH v4 2/7] iotests: Allow skipping test cases Max Reitz
2019-09-17 9:20 ` Max Reitz [this message]
2019-09-17 13:00 ` [Qemu-devel] [PATCH v4 3/7] iotests: Use case_skip() in skip_if_unsupported() Andrey Shinkevich
2019-09-18 18:31 ` John Snow
2019-09-17 9:20 ` [Qemu-devel] [PATCH v4 4/7] iotests: Let skip_if_unsupported accept a function Max Reitz
2019-09-17 13:40 ` Andrey Shinkevich
2019-09-17 9:20 ` [Qemu-devel] [PATCH v4 5/7] iotests: Test driver whitelisting in 093 Max Reitz
2019-09-17 14:25 ` Andrey Shinkevich
2019-09-18 6:29 ` Max Reitz
2019-09-18 16:50 ` Andrey Shinkevich
2019-09-18 18:37 ` John Snow
2019-09-17 9:20 ` [Qemu-devel] [PATCH v4 6/7] iotests: Test driver whitelisting in 136 Max Reitz
2019-09-17 15:14 ` Andrey Shinkevich
2019-09-18 18:39 ` John Snow
2019-09-17 9:20 ` [Qemu-devel] [PATCH v4 7/7] iotests: Cache supported_formats() Max Reitz
2019-09-17 15:50 ` Andrey Shinkevich
2019-10-14 14:59 ` [PATCH v4 0/7] iotests: Selfish patches Max Reitz
2019-10-15 5:44 ` Andrey Shinkevich
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=20190917092004.999-4-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=andrey.shinkevich@virtuozzo.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.