From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, mreitz@redhat.com, jcody@redhat.com,
jsnow@redhat.com, eblake@redhat.com, pkrempa@redhat.com,
qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH v2 09/16] qemu-iotests: iotests.py helper for non-file protocols
Date: Tue, 29 May 2018 22:39:03 +0200 [thread overview]
Message-ID: <20180529203910.7615-10-kwolf@redhat.com> (raw)
In-Reply-To: <20180529203910.7615-1-kwolf@redhat.com>
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(+)
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
next prev parent reply other threads:[~2018-05-29 20:39 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-29 20:38 [Qemu-devel] [PATCH v2 00/16] block: Make blockdev-create a job and stable API Kevin Wolf
2018-05-29 20:38 ` [Qemu-devel] [PATCH v2 01/16] vdi: Fix vdi_co_do_create() return value Kevin Wolf
2018-05-29 20:38 ` [Qemu-devel] [PATCH v2 02/16] vhdx: Fix vhdx_co_create() " Kevin Wolf
2018-05-29 20:38 ` [Qemu-devel] [PATCH v2 03/16] job: Add error message for failing jobs Kevin Wolf
2018-05-30 4:15 ` Jeff Cody
2018-05-30 9:48 ` Max Reitz
2018-05-29 20:38 ` [Qemu-devel] [PATCH v2 04/16] block/create: Make x-blockdev-create a job Kevin Wolf
2018-05-30 4:22 ` Jeff Cody
2018-05-29 20:38 ` [Qemu-devel] [PATCH v2 05/16] qemu-iotests: Add VM.get_qmp_events_filtered() Kevin Wolf
2018-05-30 4:23 ` Jeff Cody
2018-05-29 20:39 ` [Qemu-devel] [PATCH v2 06/16] qemu-iotests: Add VM.qmp_log() Kevin Wolf
2018-05-30 9:57 ` Max Reitz
2018-05-29 20:39 ` [Qemu-devel] [PATCH v2 07/16] qemu-iotests: Add iotests.img_info_log() Kevin Wolf
2018-05-30 4:25 ` Jeff Cody
2018-05-30 9:59 ` Max Reitz
2018-05-29 20:39 ` [Qemu-devel] [PATCH v2 08/16] qemu-iotests: Add VM.run_job() Kevin Wolf
2018-05-30 4:35 ` Jeff Cody
2018-05-30 10:04 ` Max Reitz
2018-05-29 20:39 ` Kevin Wolf [this message]
2018-05-30 4:33 ` [Qemu-devel] [PATCH v2 09/16] qemu-iotests: iotests.py helper for non-file protocols Jeff Cody
2018-05-30 10:06 ` Max Reitz
2018-05-29 20:39 ` [Qemu-devel] [PATCH v2 10/16] qemu-iotests: Rewrite 206 for blockdev-create job Kevin Wolf
2018-05-30 10:09 ` Max Reitz
2018-05-29 20:39 ` [Qemu-devel] [PATCH v2 11/16] qemu-iotests: Rewrite 207 " Kevin Wolf
2018-05-30 10:15 ` Max Reitz
2018-05-29 20:39 ` [Qemu-devel] [PATCH v2 12/16] qemu-iotests: Rewrite 210 " Kevin Wolf
2018-05-29 20:39 ` [Qemu-devel] [PATCH v2 13/16] qemu-iotests: Rewrite 211 " Kevin Wolf
2018-05-29 20:39 ` [Qemu-devel] [PATCH v2 14/16] qemu-iotests: Rewrite 212 " Kevin Wolf
2018-05-29 20:39 ` [Qemu-devel] [PATCH v2 15/16] qemu-iotests: Rewrite 213 " Kevin Wolf
2018-05-29 20:39 ` [Qemu-devel] [PATCH v2 16/16] block/create: Mark blockdev-create stable Kevin Wolf
2018-05-29 21:01 ` [Qemu-devel] [PATCH v2 00/16] block: Make blockdev-create a job and stable API no-reply
2018-05-30 1:43 ` Jeff Cody
2018-05-30 13:31 ` Jeff Cody
2018-05-30 14:33 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180529203910.7615-10-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=eblake@redhat.com \
--cc=jcody@redhat.com \
--cc=jsnow@redhat.com \
--cc=mreitz@redhat.com \
--cc=pkrempa@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).