From 3f5c4076f118072ac7403ca092d63a1766cd5e04 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 1 Sep 2017 11:54:34 +0100 Subject: [PATCH] iotests: blacklist 194 with the luks driver The 194 test has a lot of code that assumes a simple image file. Rewriting this to work with luks is possible, but non-trivial, so blacklist the luks format for now. Signed-off-by: Daniel P. Berrange Message-Id: <20170901105434.3288-3-berrange@redhat.com> Reviewed-by: Eric Blake Tested-by: Fam Zheng [eblake: commit message typo fixed] Reviewed-by: Kashyap Chamarthy Reviewed-by: Stefan Hajnoczi Signed-off-by: Eric Blake --- tests/qemu-iotests/194 | 1 + tests/qemu-iotests/iotests.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 index 6449b9b64a..8d973b440f 100755 --- a/tests/qemu-iotests/194 +++ b/tests/qemu-iotests/194 @@ -21,6 +21,7 @@ import iotests +iotests.verify_image_format(unsupported_fmts=['luks']) iotests.verify_platform(['linux']) with iotests.FilePath('source.img') as source_img_path, \ diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 07fa1626a0..1af117e37d 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -421,9 +421,11 @@ def notrun(reason): print '%s not run: %s' % (seq, reason) sys.exit(0) -def verify_image_format(supported_fmts=[]): +def verify_image_format(supported_fmts=[], unsupported_fmts=[]): if supported_fmts and (imgfmt not in supported_fmts): notrun('not suitable for this image format: %s' % imgfmt) + if unsupported_fmts and (imgfmt in unsupported_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]: -- 2.11.0