| Message ID | 20170901105434.3288-3-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix / skip recent iotests with LUKS driver | expand |
On 09/01/2017 05:54 AM, Daniel P. Berrange wrote: > The 194 test has alot of code that assumes a simple image file. Rewriting s/alot/a lot/ > this to work with luks is possible, but non-trivial, so blacklist the > luks format for now. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > tests/qemu-iotests/194 | 1 + > tests/qemu-iotests/iotests.py | 4 +++- > 2 files changed, 4 insertions(+), 1 deletion(-) Reviewed-by: Eric Blake <eblake@redhat.com>
On Fri, Sep 01, 2017 at 11:54:34AM +0100, Daniel P. Berrange wrote: > The 194 test has alot 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 <berrange@redhat.com> > --- > tests/qemu-iotests/194 | 1 + > tests/qemu-iotests/iotests.py | 4 +++- > 2 files changed, 4 insertions(+), 1 deletion(-) Reviewed-by: Kashyap Chamarthy <kchamart@redhat.com> > diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 > index a3e3bad664..bfe1859ecf 100755 > --- a/tests/qemu-iotests/194 > +++ b/tests/qemu-iotests/194 > @@ -23,6 +23,7 @@ import os > import atexit > import iotests > > +iotests.verify_image_format(unsupported_fmts=['luks']) > iotests.verify_platform(['linux']) > > img_size = '1G' > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 7233983f3c..3e7304b678 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -395,9 +395,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.13.5 > >
On Fri, Sep 01, 2017 at 11:54:34AM +0100, Daniel P. Berrange wrote: > The 194 test has alot 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 <berrange@redhat.com> > --- > tests/qemu-iotests/194 | 1 + > tests/qemu-iotests/iotests.py | 4 +++- > 2 files changed, 4 insertions(+), 1 deletion(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 index a3e3bad664..bfe1859ecf 100755 --- a/tests/qemu-iotests/194 +++ b/tests/qemu-iotests/194 @@ -23,6 +23,7 @@ import os import atexit import iotests +iotests.verify_image_format(unsupported_fmts=['luks']) iotests.verify_platform(['linux']) img_size = '1G' diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 7233983f3c..3e7304b678 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -395,9 +395,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]:
The 194 test has alot 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 <berrange@redhat.com> --- tests/qemu-iotests/194 | 1 + tests/qemu-iotests/iotests.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)