[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/5] iotests.py: Add skip_for_formats() decorator
From: |
Max Reitz |
Subject: |
[PATCH 1/5] iotests.py: Add skip_for_formats() decorator |
Date: |
Wed, 17 Jun 2020 12:48:18 +0200 |
Sometimes, we want to skip some test methods for certain formats. This
decorator allows that.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/118 | 7 +++----
tests/qemu-iotests/iotests.py | 13 +++++++++++++
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index adc8a848b5..2350929fd8 100755
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118
@@ -683,11 +683,10 @@ class TestBlockJobsAfterCycle(ChangeBaseClass):
except OSError:
pass
+ # We need backing file support
+ @iotests.skip_for_formats(('vpc', 'parallels', 'qcow', 'vdi', 'vmdk',
'raw',
+ 'vhdx'))
def test_snapshot_and_commit(self):
- # We need backing file support
- if iotests.imgfmt != 'qcow2' and iotests.imgfmt != 'qed':
- return
-
result = self.vm.qmp('blockdev-snapshot-sync', device='drive0',
snapshot_file=new_img,
format=iotests.imgfmt)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index f20d90f969..92c08b9dc6 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1103,6 +1103,19 @@ def skip_if_unsupported(required_formats=(),
read_only=False):
return func_wrapper
return skip_test_decorator
+def skip_for_formats(formats: Sequence[str] = ()):
+ '''Skip Test Decorator
+ Skips the test for the given formats'''
+ def skip_test_decorator(func):
+ def func_wrapper(test_case: QMPTestCase, *args: List[Any],
+ **kwargs: Dict[str, Any]) -> None:
+ if imgfmt in formats:
+ test_case.case_skip(f'{test_case}: Skipped for format
{imgfmt}')
+ else:
+ func(test_case, *args, **kwargs)
+ return func_wrapper
+ return skip_test_decorator
+
def skip_if_user_is_root(func):
'''Skip Test Decorator
Runs the test only without root permissions'''
--
2.26.2
- [PATCH 0/5] iotests: Some fixes for rarely run cases, Max Reitz, 2020/06/17
- [PATCH 2/5] iotests/041: Skip test_small_target for qed, Max Reitz, 2020/06/17
- [PATCH 1/5] iotests.py: Add skip_for_formats() decorator,
Max Reitz <=
- [PATCH 3/5] iotests/292: data_file is unsupported, Max Reitz, 2020/06/17
- [PATCH 4/5] iotests/229: data_file is unsupported, Max Reitz, 2020/06/17
- [PATCH 5/5] iotests/{190,291}: compat=0.10 is unsupported, Max Reitz, 2020/06/17
- Re: [PATCH 0/5] iotests: Some fixes for rarely run cases, no-reply, 2020/06/17
- Re: [PATCH 0/5] iotests: Some fixes for rarely run cases, Kevin Wolf, 2020/06/17