From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
To: Max Reitz <mreitz@redhat.com>,
"qemu-block@nongnu.org" <qemu-block@nongnu.org>
Cc: Kevin Wolf <kwolf@redhat.com>, Thomas Huth <thuth@redhat.com>,
John Snow <jsnow@redhat.com>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH v3 3/8] iotests: Allow skipping test cases
Date: Wed, 21 Aug 2019 17:39:19 +0000 [thread overview]
Message-ID: <25006dda-cbd8-bb8e-4fbd-9a7894982d25@virtuozzo.com> (raw)
In-Reply-To: <20190819201851.24418-4-mreitz@redhat.com>
On 19/08/2019 23:18, Max Reitz wrote:
> case_notrun() does not actually skip the current test case. It just
> adds a "notrun" note and then returns to the caller, who manually has to
> skip the test. Generally, skipping a test case is as simple as
> returning from the current function, but not always: For example, this
> model does not allow skipping tests already in the setUp() function.
>
> Thus, add a QMPTestCase.case_skip() function that invokes case_notrun()
> and then self.skipTest(). To make this work, we need to filter the
> information on how many test cases were skipped from the unittest
> output.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/iotests.py | 21 ++++++++++++++++++---
> 1 file changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 84438e837c..2f53baf633 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -802,6 +802,11 @@ class QMPTestCase(unittest.TestCase):
> return self.pause_wait(job_id)
> return result
>
> + def case_skip(self, reason):
> + '''Skip this test case'''
> + case_notrun(reason)
> + self.skipTest(reason)
> +
>
> def notrun(reason):
> '''Skip this test suite'''
> @@ -813,7 +818,10 @@ def notrun(reason):
> sys.exit(0)
>
> def case_notrun(reason):
> - '''Skip this test case'''
> + '''Mark this test case as not having been run, but do not actually
> + skip it; that is left to the caller. See QMPTestCase.case_skip()
The clause "do not actually skip it" sounds like a prescription. I would
like the comment to be clearer for a reader that the method is a
notifier only.
Andrey
> + for a variant that actually skips the current test case.'''
> +
> # Each test in qemu-iotests has a number ("seq")
> seq = os.path.basename(sys.argv[0])
>
> @@ -904,8 +912,15 @@ def execute_unittest(output, verbosity, debug):
> unittest.main(testRunner=runner)
> finally:
> if not debug:
> - sys.stderr.write(re.sub(r'Ran (\d+) tests? in [\d.]+s',
> - r'Ran \1 tests', output.getvalue()))
> + out = output.getvalue()
> + out = re.sub(r'Ran (\d+) tests? in [\d.]+s', r'Ran \1 tests', out)
> +
> + # Hide skipped tests from the reference output
> + out = re.sub(r'OK \(skipped=\d+\)', 'OK', out)
> + out_first_line, out_rest = out.split('\n', 1)
> + out = out_first_line.replace('s', '.') + '\n' + out_rest
> +
> + sys.stderr.write(out)
>
> def execute_test(test_function=None,
> supported_fmts=[], supported_oses=['linux'],
>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
--
With the best regards,
Andrey Shinkevich
next prev parent reply other threads:[~2019-08-21 18:39 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 20:18 [Qemu-devel] [PATCH v3 0/8] iotests: Selfish patches Max Reitz
2019-08-19 20:18 ` [Qemu-devel] [PATCH v3 1/8] iotests: Add -display none to the qemu options Max Reitz
2019-08-20 6:36 ` Thomas Huth
2019-08-19 20:18 ` [Qemu-devel] [PATCH v3 2/8] iotests: Prefer null-co over null-aio Max Reitz
2019-08-19 20:22 ` Max Reitz
2019-08-20 21:05 ` John Snow
2019-08-20 6:38 ` Thomas Huth
2019-08-19 20:18 ` [Qemu-devel] [PATCH v3 3/8] iotests: Allow skipping test cases Max Reitz
2019-08-20 21:17 ` John Snow
2019-08-21 17:39 ` Andrey Shinkevich [this message]
2019-08-19 20:18 ` [Qemu-devel] [PATCH v3 4/8] iotests: Use case_skip() in skip_if_unsupported() Max Reitz
2019-08-20 21:27 ` John Snow
2019-08-21 10:50 ` Max Reitz
2019-08-19 20:18 ` [Qemu-devel] [PATCH v3 5/8] iotests: Let skip_if_unsupported() accept a method Max Reitz
2019-08-20 21:31 ` John Snow
2019-08-21 10:54 ` Max Reitz
2019-08-19 20:18 ` [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093 Max Reitz
2019-08-20 6:40 ` Thomas Huth
2019-08-20 12:23 ` Max Reitz
2019-08-20 21:32 ` John Snow
2019-08-21 10:55 ` Max Reitz
2019-09-13 12:47 ` Max Reitz
2019-09-13 18:30 ` John Snow
2019-09-17 8:18 ` Max Reitz
2019-09-17 8:29 ` Max Reitz
2019-09-17 8:32 ` Max Reitz
2019-09-17 8:40 ` Kevin Wolf
2019-09-17 11:07 ` Max Reitz
2019-09-17 11:22 ` Kevin Wolf
2019-09-17 13:09 ` John Snow
2019-09-17 13:42 ` Kevin Wolf
2019-09-17 13:44 ` John Snow
2019-09-17 14:05 ` Kevin Wolf
2019-09-17 14:12 ` Max Reitz
2019-08-19 20:18 ` [Qemu-devel] [PATCH v3 7/8] iotests: Test driver whitelisting in 136 Max Reitz
2019-08-19 20:18 ` [Qemu-devel] [PATCH v3 8/8] iotests: Cache supported_formats() Max Reitz
2019-08-20 21:10 ` John Snow
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=25006dda-cbd8-bb8e-4fbd-9a7894982d25@virtuozzo.com \
--to=andrey.shinkevich@virtuozzo.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@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 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).