[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/17] qemu-iotests: iotests.py helper for non-file p
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 10/17] qemu-iotests: iotests.py helper for non-file protocols |
Date: |
Wed, 30 May 2018 17:56:40 +0200 |
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 <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
---
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
- [Qemu-devel] [PULL 00/17] Block layer patches, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 02/17] vdi: Fix vdi_co_do_create() return value, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 01/17] qcow2: Fix Coverity warning when calculating the refcount cache size, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 03/17] vhdx: Fix vhdx_co_create() return value, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 06/17] qemu-iotests: Add VM.get_qmp_events_filtered(), Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 04/17] job: Add error message for failing jobs, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 08/17] qemu-iotests: Add iotests.img_info_log(), Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 05/17] block/create: Make x-blockdev-create a job, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 07/17] qemu-iotests: Add VM.qmp_log(), Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 09/17] qemu-iotests: Add VM.run_job(), Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 10/17] qemu-iotests: iotests.py helper for non-file protocols,
Kevin Wolf <=
- [Qemu-devel] [PULL 12/17] qemu-iotests: Rewrite 207 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 15/17] qemu-iotests: Rewrite 212 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 14/17] qemu-iotests: Rewrite 211 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 13/17] qemu-iotests: Rewrite 210 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 11/17] qemu-iotests: Rewrite 206 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 16/17] qemu-iotests: Rewrite 213 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-devel] [PULL 17/17] block/create: Mark blockdev-create stable, Kevin Wolf, 2018/05/30
- Re: [Qemu-devel] [PULL 00/17] Block layer patches, no-reply, 2018/05/30
- Re: [Qemu-devel] [PULL 00/17] Block layer patches, Peter Maydell, 2018/05/31