[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 04/11] tests: refactor python I/O tests helper ma
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v6 04/11] tests: refactor python I/O tests helper main method |
Date: |
Mon, 21 Mar 2016 14:11:45 +0000 |
The iotests.py helper provides a main() method for running
tests via the python unit test framework. Not all tests
will want to use this, so refactor it to split the testing
of compatible formats and platforms into separate helper
methods
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
tests/qemu-iotests/iotests.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 5f82bbe..51e53bb 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -29,7 +29,8 @@ import qtest
import struct
__all__ = ['imgfmt', 'imgproto', 'test_dir' 'qemu_img', 'qemu_io',
- 'VM', 'QMPTestCase', 'notrun', 'main']
+ 'VM', 'QMPTestCase', 'notrun', 'main', 'verify_image_format',
+ 'verify_platform']
# This will not work if arguments contain spaces but is necessary if we
# want to support the override options that ./check supports.
@@ -394,17 +395,22 @@ def notrun(reason):
print '%s not run: %s' % (seq, reason)
sys.exit(0)
-def main(supported_fmts=[], supported_oses=['linux']):
- '''Run tests'''
-
- debug = '-d' in sys.argv
- verbosity = 1
+def verify_image_format(supported_fmts=[]):
if supported_fmts and (imgfmt not in supported_fmts):
notrun('not suitable for this image format: %s' % imgfmt)
+def verify_platform(supported_oses=['linux']):
if True not in [sys.platform.startswith(x) for x in supported_oses]:
notrun('not suitable for this OS: %s' % sys.platform)
+def main(supported_fmts=[], supported_oses=['linux']):
+ '''Run tests'''
+
+ debug = '-d' in sys.argv
+ verbosity = 1
+ verify_image_format(supported_fmts)
+ verify_platform(supported_oses)
+
# We need to filter out the time taken from the output so that qemu-iotest
# can reliably diff the results against master output.
import StringIO
--
2.5.0
- [Qemu-devel] [PATCH v6 00/11] Add new LUKS block driver (for 2.6), Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 04/11] tests: refactor python I/O tests helper main method,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v6 03/11] tests: redirect stderr to stdout for iotests, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 05/11] tests: add output filter to python I/O tests helper, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 01/11] block: add flag to indicate that no I/O will be performed, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 02/11] qemu-img/qemu-io: don't prompt for passwords if not required, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 08/11] block: add support for --image-opts in block I/O tests, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 06/11] block: add generic full disk encryption driver, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 07/11] block: move encryption deprecation warning into qcow code, Daniel P. Berrange, 2016/03/21