[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 3/8] iotests: Allow skipping test cases
From: |
Andrey Shinkevich |
Subject: |
Re: [Qemu-devel] [PATCH v3 3/8] iotests: Allow skipping test cases |
Date: |
Wed, 21 Aug 2019 17:39:19 +0000 |
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 <address@hidden>
> ---
> 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 <address@hidden>
--
With the best regards,
Andrey Shinkevich
- [Qemu-devel] [PATCH v3 0/8] iotests: Selfish patches, Max Reitz, 2019/08/19
- [Qemu-devel] [PATCH v3 1/8] iotests: Add -display none to the qemu options, Max Reitz, 2019/08/19
- [Qemu-devel] [PATCH v3 2/8] iotests: Prefer null-co over null-aio, Max Reitz, 2019/08/19
- [Qemu-devel] [PATCH v3 3/8] iotests: Allow skipping test cases, Max Reitz, 2019/08/19
- [Qemu-devel] [PATCH v3 4/8] iotests: Use case_skip() in skip_if_unsupported(), Max Reitz, 2019/08/19
- [Qemu-devel] [PATCH v3 5/8] iotests: Let skip_if_unsupported() accept a method, Max Reitz, 2019/08/19
- [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093, Max Reitz, 2019/08/19