Skip to content

Commit

Permalink
iotests: blacklist 194 with the luks driver
Browse files Browse the repository at this point in the history
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 <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Tested-by: Fam Zheng <[email protected]>
[eblake: commit message typo fixed]
Reviewed-by: Kashyap Chamarthy <[email protected]>
Reviewed-by: Stefan Hajnoczi <[email protected]>
Signed-off-by: Eric Blake <[email protected]>
  • Loading branch information
berrange authored and ebblake committed Sep 5, 2017
1 parent 0127b79 commit 3f5c407
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions tests/qemu-iotests/194
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down
4 changes: 3 additions & 1 deletion tests/qemu-iotests/iotests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]:
Expand Down

0 comments on commit 3f5c407

Please sign in to comment.