| Message ID | 20180529203910.7615-10-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | block: Make blockdev-create a job and stable API | expand |
On Tue, May 29, 2018 at 10:39:03PM +0200, Kevin Wolf wrote: > This adds two helper functions that are useful for test cases that make > use of a non-file protocol (specifically ssh). > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com> > --- > tests/qemu-iotests/iotests.py | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 8b612cb891..bc8f404ac2 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -303,6 +303,13 @@ def file_path(*names): > > return paths[0] if len(paths) == 1 else paths > > +def remote_filename(path): > + if imgproto == 'file': > + return path > + elif imgproto == 'ssh': > + return "ssh://127.0.0.1%s" % (path) > + else: > + raise Exception("Protocol %s not supported" % (imgproto)) > > class VM(qtest.QEMUQtestMachine): > '''A QEMU VM''' > @@ -601,6 +608,16 @@ def verify_image_format(supported_fmts=[], unsupported_fmts=[]): > if not_sup or (imgfmt in unsupported_fmts): > notrun('not suitable for this image format: %s' % imgfmt) > > +def verify_protocol(supported=[], unsupported=[]): > + assert not (supported and unsupported) > + > + if 'generic' in supported: > + return > + > + not_sup = supported and (imgproto not in supported) > + if not_sup or (imgproto in unsupported): > + notrun('not suitable for this protocol: %s' % imgproto) > + > 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) > -- > 2.13.6 >
On 2018-05-29 22:39, Kevin Wolf wrote: > This adds two helper functions that are useful for test cases that make > use of a non-file protocol (specifically ssh). > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > tests/qemu-iotests/iotests.py | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) Reviewed-by: Max Reitz <mreitz@redhat.com>
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 8b612cb891..bc8f404ac2 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -303,6 +303,13 @@ def file_path(*names): return paths[0] if len(paths) == 1 else paths +def remote_filename(path): + if imgproto == 'file': + return path + elif imgproto == 'ssh': + return "ssh://127.0.0.1%s" % (path) + else: + raise Exception("Protocol %s not supported" % (imgproto)) class VM(qtest.QEMUQtestMachine): '''A QEMU VM''' @@ -601,6 +608,16 @@ def verify_image_format(supported_fmts=[], unsupported_fmts=[]): if not_sup or (imgfmt in unsupported_fmts): notrun('not suitable for this image format: %s' % imgfmt) +def verify_protocol(supported=[], unsupported=[]): + assert not (supported and unsupported) + + if 'generic' in supported: + return + + not_sup = supported and (imgproto not in supported) + if not_sup or (imgproto in unsupported): + notrun('not suitable for this protocol: %s' % imgproto) + 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)
This adds two helper functions that are useful for test cases that make use of a non-file protocol (specifically ssh). Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- tests/qemu-iotests/iotests.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)