From: John Snow <jsnow@redhat.com>
To: Max Reitz <mreitz@redhat.com>, qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-devel@nongnu.org, Cleber Rosa <crosa@redhat.com>
Subject: Re: [Qemu-devel] [Qemu-block] [PATCH v2 3/5] iotests: Allow skipping test cases
Date: Mon, 12 Aug 2019 15:00:09 -0400 [thread overview]
Message-ID: <4ed1bd3f-9b47-cbe7-ddc2-dca2e2d349b9@redhat.com> (raw)
In-Reply-To: <20190625211955.15664-4-mreitz@redhat.com>
On 6/25/19 5:19 PM, 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.
>
I feel like skipping sub-tests has been a point of contention before,
but I don't recall the outcome.
Cleber, can you help jog my memory?
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/iotests.py | 20 ++++++++++++++++++--
> 1 file changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 3ecef5bc90..1b0ac50153 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -741,6 +741,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'''
> @@ -752,7 +757,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()
> + 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])
>
> @@ -879,4 +887,12 @@ def main(supported_fmts=[], supported_oses=['linux'], supported_cache_modes=[],
> unittest.main(testRunner=MyTestRunner)
> 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)
>
--
—js
next prev parent reply other threads:[~2019-08-12 19:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 21:19 [Qemu-devel] [PATCH v2 0/5] iotests: Selfish patches Max Reitz
2019-06-25 21:19 ` [Qemu-devel] [PATCH v2 1/5] iotests: Add -display none to the qemu options Max Reitz
2019-06-26 10:36 ` Philippe Mathieu-Daudé
2019-06-25 21:19 ` [Qemu-devel] [PATCH v2 2/5] iotests: Prefer null-co over null-aio Max Reitz
2019-08-12 18:59 ` [Qemu-devel] [Qemu-block] " John Snow
2019-06-25 21:19 ` [Qemu-devel] [PATCH v2 3/5] iotests: Allow skipping test cases Max Reitz
2019-08-12 19:00 ` John Snow [this message]
2019-06-25 21:19 ` [Qemu-devel] [PATCH v2 4/5] iotests: Test driver whitelisting in 093 Max Reitz
2019-06-25 21:19 ` [Qemu-devel] [PATCH v2 5/5] iotests: Test driver whitelisting in 136 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=4ed1bd3f-9b47-cbe7-ddc2-dca2e2d349b9@redhat.com \
--to=jsnow@redhat.com \
--cc=crosa@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@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).