From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH 10/10] iotests: Add test for the JSON protocol
Date: Mon, 3 Mar 2014 16:28:53 +0100 [thread overview]
Message-ID: <1393860533-2063-11-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1393860533-2063-1-git-send-email-mreitz@redhat.com>
Add a test for the JSON protocol driver.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/084 | 114 +++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/084.out | 39 ++++++++++++++++
tests/qemu-iotests/group | 1 +
3 files changed, 154 insertions(+)
create mode 100755 tests/qemu-iotests/084
create mode 100644 tests/qemu-iotests/084.out
diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084
new file mode 100755
index 0000000..46be241
--- /dev/null
+++ b/tests/qemu-iotests/084
@@ -0,0 +1,114 @@
+#!/bin/bash
+#
+# Test case for the JSON block protocol
+#
+# Copyright (C) 2014 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+# creator
+owner=mreitz@redhat.com
+
+seq="$(basename $0)"
+echo "QA output created by $seq"
+
+here="$PWD"
+tmp=/tmp/$$
+status=1 # failure is the default!
+
+_cleanup()
+{
+ _cleanup_test_img
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+_supported_fmt qcow2
+_supported_proto file
+_supported_os Linux
+
+IMG_SIZE=64M
+
+# Taken from test 072
+echo
+echo "=== Testing nested image formats (072) ==="
+echo
+
+TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE
+
+$QEMU_IO -c 'write -P 42 0 512' -c 'write -P 23 512 512' \
+ -c 'write -P 66 1024 512' "$TEST_IMG.base" | _filter_qemu_io
+
+$QEMU_IMG convert -f raw -O $IMGFMT "$TEST_IMG.base" "$TEST_IMG"
+
+$QEMU_IO -c 'read -P 42 0 512' -c 'read -P 23 512 512' \
+ -c 'read -P 66 1024 512' "json:{
+ \"driver\": \"$IMGFMT\",
+ \"file\": {
+ \"driver\": \"$IMGFMT\",
+ \"file\": {
+ \"filename\": \"$TEST_IMG\"
+ }
+ }
+}" | _filter_qemu_io
+
+# This should fail (see test 072)
+$QEMU_IO -c 'read -P 42 0 512' "$TEST_IMG" | _filter_qemu_io
+
+
+# Taken from test 071
+echo
+echo "=== Testing blkdebug (071) ==="
+echo
+
+_make_test_img $IMG_SIZE
+
+$QEMU_IO -c 'write -P 42 0x38000 512' "$TEST_IMG" | _filter_qemu_io
+
+# The "image.filename" part tests whether "a": { "b": "c" } and "a.b": "c" do
+# the same (which they should).
+# This has to use -g to force qemu-io to use BDRV_O_PROTOCOL, since it will try
+# to determine the format of the file otherwise; due to the complexity of the
+# filename, only raw (or json itself) will work and this will then result in an
+# error because of the blkdebug part. Thus, use -g.
+$QEMU_IO -c 'read -P 42 0x38000 512' -g "json:{
+ \"driver\": \"$IMGFMT\",
+ \"file\": {
+ \"driver\": \"blkdebug\",
+ \"inject-error\": [{
+ \"event\": \"l2_load\"
+ }],
+ \"image.filename\": \"$TEST_IMG\"
+ }
+}" | _filter_qemu_io
+
+
+echo
+echo "=== Testing qemu-img info output ==="
+echo
+
+# This should output information about the image itself, not about the JSON
+# block device.
+$QEMU_IMG info "json:{\"driver\":\"qcow2\",\"file.filename\":\"$TEST_IMG\"}" \
+ | _filter_testdir | _filter_imgfmt
+
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/084.out b/tests/qemu-iotests/084.out
new file mode 100644
index 0000000..d475aec
--- /dev/null
+++ b/tests/qemu-iotests/084.out
@@ -0,0 +1,39 @@
+QA output created by 084
+
+=== Testing nested image formats (072) ===
+
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
+wrote 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 512/512 bytes at offset 512
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 512/512 bytes at offset 1024
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read 512/512 bytes at offset 512
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read 512/512 bytes at offset 1024
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+Pattern verification failed at offset 0, 512 bytes
+read 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+=== Testing blkdebug (071) ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+wrote 512/512 bytes at offset 229376
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read failed: Input/output error
+
+=== Testing qemu-img info output ===
+
+image: TEST_DIR/t.IMGFMT
+file format: IMGFMT
+virtual size: 64M (67108864 bytes)
+disk size: 324K
+cluster_size: 65536
+Format specific information:
+ compat: 1.1
+ lazy refcounts: false
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index db127d9..3b7d0e6 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -85,3 +85,4 @@
079 rw auto
081 rw auto
082 rw auto quick
+084 rw auto quick
--
1.9.0
next prev parent reply other threads:[~2014-03-03 15:29 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-03 15:28 [Qemu-devel] [PATCH 00/10] block/json: Add JSON protocol driver Max Reitz
2014-03-03 15:28 ` [Qemu-devel] [PATCH 01/10] qdict: Add qdict_join() Max Reitz
2014-03-05 15:55 ` Benoît Canet
2014-03-05 16:01 ` Kevin Wolf
2014-03-05 16:06 ` Benoît Canet
2014-03-05 16:52 ` Eric Blake
2014-03-05 20:13 ` Max Reitz
2014-03-03 15:28 ` [Qemu-devel] [PATCH 02/10] block/json: Add JSON protocol driver Max Reitz
2014-03-05 16:04 ` Benoît Canet
2014-03-05 19:58 ` Max Reitz
2014-03-05 20:20 ` Benoît Canet
2014-03-05 20:21 ` Max Reitz
2014-03-05 21:18 ` Benoît Canet
2014-03-03 15:28 ` [Qemu-devel] [PATCH 03/10] block/json: Add functions for cache control Max Reitz
2014-03-05 16:07 ` Benoît Canet
2014-03-03 15:28 ` [Qemu-devel] [PATCH 04/10] block/json: Add functions for writing zeroes etc Max Reitz
2014-03-05 16:09 ` Benoît Canet
2014-03-05 20:03 ` Max Reitz
2014-03-03 15:28 ` [Qemu-devel] [PATCH 05/10] block/json: Add bdrv_co_get_block_status() Max Reitz
2014-03-05 16:11 ` Benoît Canet
2014-03-05 20:10 ` Max Reitz
2014-03-05 20:41 ` Benoît Canet
2014-03-05 20:44 ` Max Reitz
2014-03-05 23:22 ` Benoît Canet
2014-03-06 20:01 ` Max Reitz
2014-03-03 15:28 ` [Qemu-devel] [PATCH 06/10] block/json: Add ioctl etc Max Reitz
2014-03-05 16:14 ` Benoît Canet
2014-03-03 15:28 ` [Qemu-devel] [PATCH 07/10] block/json: Add bdrv_get_specific_info() Max Reitz
2014-03-05 16:15 ` Benoît Canet
2014-03-03 15:28 ` [Qemu-devel] [PATCH 08/10] block/raw_bsd: " Max Reitz
2014-03-05 16:16 ` Benoît Canet
2014-03-03 15:28 ` [Qemu-devel] [PATCH 09/10] block/qapi: Ignore filters on top for format name Max Reitz
2014-03-05 16:20 ` Benoît Canet
2014-03-05 20:11 ` Max Reitz
2014-03-03 15:28 ` Max Reitz [this message]
2014-03-05 17:27 ` [Qemu-devel] [PATCH 10/10] iotests: Add test for the JSON protocol Eric Blake
2014-03-05 20:15 ` Max Reitz
2014-03-05 20:27 ` Eric Blake
2014-03-05 16:26 ` [Qemu-devel] [PATCH 00/10] block/json: Add JSON protocol driver Eric Blake
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=1393860533-2063-11-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).