From: Kevin Wolf Date: Tue, 29 May 2018 19:44:47 +0000 (+0200) Subject: qemu-iotests: iotests.py helper for non-file protocols X-Git-Tag: v3.0.0-rc0~125^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a259e868b308564de9f2bfaef0606074a4f9028;p=thirdparty%2Fqemu.git qemu-iotests: iotests.py helper for non-file protocols 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 Reviewed-by: Max Reitz Reviewed-by: Jeff Cody --- diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 8b612cb891f..bc8f404ac29 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)