summaryrefslogtreecommitdiffstats
path: root/tests/qemu-iotests/iotests.py
diff options
context:
space:
mode:
authorMax Reitz2013-10-09 10:46:20 +0200
committerKevin Wolf2013-10-11 16:49:50 +0200
commit3677e6f6252542cbab85674d97d051d95e91693b (patch)
tree6af0917754d838a5183594b747fba43ec8848bb2 /tests/qemu-iotests/iotests.py
parentqemu-iotests: Discard specific info in _img_info (diff)
downloadqemu-3677e6f6252542cbab85674d97d051d95e91693b.tar.gz
qemu-3677e6f6252542cbab85674d97d051d95e91693b.tar.xz
qemu-3677e6f6252542cbab85674d97d051d95e91693b.zip
qemu-iotests: Additional info from qemu-img info
Add a test for the additional information now provided by qemu-img info when used on qcow2 images. It also tests the qemu QMP output from the query-block command when running qemu with different runtime options than specified in the image (ImageInfoSpecific should always refer to the image). Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/iotests.py')
-rw-r--r--tests/qemu-iotests/iotests.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 376d6e8ffe..fb10ff43a7 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -49,6 +49,10 @@ def qemu_img_verbose(*args):
'''Run qemu-img without suppressing its output and return the exit code'''
return subprocess.call(qemu_img_args + list(args))
+def qemu_img_pipe(*args):
+ '''Run qemu-img and return its output'''
+ return subprocess.Popen(qemu_img_args + list(args), stdout=subprocess.PIPE).communicate()[0]
+
def qemu_io(*args):
'''Run qemu-io and return the stdout data'''
args = qemu_io_args + list(args)