qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com
Subject: [Qemu-devel] [PULL 21/29] iotests: Add test for image filename construction
Date: Fri, 22 Aug 2014 16:51:45 +0200	[thread overview]
Message-ID: <1408719113-5316-22-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1408719113-5316-1-git-send-email-kwolf@redhat.com>

From: Max Reitz <mreitz@redhat.com>

Testing a real in-use protocol such as NBD is hard; testing blkdebug and
blkverify in its stead is easier and tests basically the same
functionality.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/099     | 116 +++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/099.out |  20 ++++++++
 tests/qemu-iotests/group   |   1 +
 3 files changed, 137 insertions(+)
 create mode 100755 tests/qemu-iotests/099
 create mode 100644 tests/qemu-iotests/099.out

diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
new file mode 100755
index 0000000..a26d3d2
--- /dev/null
+++ b/tests/qemu-iotests/099
@@ -0,0 +1,116 @@
+#!/bin/bash
+#
+# Test valid filenames for blkdebug and blkverify representatively for
+# other protocols (such as NBD) when queried
+#
+# 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
+
+# Basically all formats, but "raw" has issues with _filter_imgfmt regarding the
+# raw comparison image for blkverify; also, all images have to support creation
+_supported_fmt cow qcow qcow2 qed vdi vhdx vmdk vpc
+_supported_proto file
+_supported_os Linux
+
+
+function do_run_qemu()
+{
+    $QEMU -nographic -qmp stdio -serial none "$@"
+}
+
+function run_qemu()
+{
+    # Get the "file": "foo" entry ($foo may only contain escaped double quotes,
+    # which is how we can extract it)
+    do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_imgfmt | _filter_qmp \
+        | grep "drv0" \
+        | sed -e 's/^.*"file": "\(\(\\"\|[^"]\)*\)".*$/\1/' -e 's/\\"/"/g'
+}
+
+function test_qemu()
+{
+    run_qemu -drive "if=none,id=drv0,$1" <<EOF
+        { 'execute': 'qmp_capabilities' }
+        { 'execute': 'query-block' }
+        { 'execute': 'quit' }
+EOF
+}
+
+
+
+IMG_SIZE=128K
+
+_make_test_img $IMG_SIZE
+$QEMU_IMG create -f raw "$TEST_IMG.compare" $IMG_SIZE \
+    | _filter_testdir | _filter_imgfmt
+
+echo
+echo '=== Testing simple filename for blkverify ==='
+echo
+
+# This should return simply the filename itself
+test_qemu "file=blkverify:$TEST_IMG.compare:$TEST_IMG"
+
+echo
+echo '=== Testing filename reconstruction for blkverify ==='
+echo
+
+# This should return the same filename as above
+test_qemu "file.driver=blkverify,file.raw.filename=$TEST_IMG.compare,file.test.file.filename=$TEST_IMG"
+
+echo
+echo '=== Testing JSON filename for blkdebug ==='
+echo
+
+# blkdebug cannot create a configuration file, therefore it is unable to
+# generate a plain filename here; thus this should return a JSON filename
+test_qemu "file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=l1_update"
+
+echo
+echo '=== Testing indirectly enforced JSON filename ==='
+echo
+
+# Because blkdebug cannot return a plain filename, blkverify is forced to
+# generate a JSON object here as well
+test_qemu "file.driver=blkverify,file.raw.filename=$TEST_IMG.compare,file.test.file.driver=blkdebug,file.test.file.image.filename=$TEST_IMG,file.test.file.inject-error.0.event=l1_update"
+
+
+rm -f "$TEST_IMG.compare"
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/099.out b/tests/qemu-iotests/099.out
new file mode 100644
index 0000000..55be4d4
--- /dev/null
+++ b/tests/qemu-iotests/099.out
@@ -0,0 +1,20 @@
+QA output created by 099
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 
+Formatting 'TEST_DIR/t.IMGFMT.compare', fmt=raw size=131072 
+
+=== Testing simple filename for blkverify ===
+
+blkverify:TEST_DIR/t.IMGFMT.compare:TEST_DIR/t.IMGFMT
+
+=== Testing filename reconstruction for blkverify ===
+
+blkverify:TEST_DIR/t.IMGFMT.compare:TEST_DIR/t.IMGFMT
+
+=== Testing JSON filename for blkdebug ===
+
+json:{"driver": "IMGFMT", "file": {"inject-error": [{"immediately": false, "once": false, "state": 0, "sector": -1, "event": "l1_update", "errno": 5}], "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug"}}
+
+=== Testing indirectly enforced JSON filename ===
+
+json:{"driver": "raw", "file": {"test": {"driver": "IMGFMT", "file": {"inject-error": [{"immediately": false, "once": false, "state": 0, "sector": -1, "event": "l1_update", "errno": 5}], "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug"}}, "driver": "blkverify", "raw": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.compare"}}}
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 1c8d453..f157864 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -100,4 +100,5 @@
 091 rw auto quick
 092 rw auto quick
 095 rw auto quick
+099 rw auto quick
 103 rw auto quick
-- 
1.8.3.1

  parent reply	other threads:[~2014-08-22 14:52 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-22 14:51 [Qemu-devel] [PULL 00/29] Block patches Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 01/29] block: Use g_new() & friends where that makes obvious sense Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 02/29] block: Use g_new() & friends to avoid multiplying sizes Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 03/29] qemu-io-cmds: g_renew() can't fail, bury dead error handling Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 04/29] block: Drop some superfluous casts from void * Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 05/29] runner: Add an argument for test duration Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 06/29] runner: Kill a program under test by time-out Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 07/29] qcow2: Constant cache size in bytes Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 08/29] qcow2: Use g_try_new0() for cache array Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 09/29] qcow2: Add runtime options for cache sizes Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 10/29] iotests: Add test for qcow2's cache options Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 11/29] test-coroutine: test cost introduced by coroutine Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 12/29] qemu-iotests: Fix 028 reference output for qed Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 13/29] block: acquire AioContext in qmp_block_resize() Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 14/29] virtio-blk: allow block_resize with dataplane Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 15/29] virtio-blk: fix reference a pointer which might be freed Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 16/29] block: Add bdrv_refresh_filename() Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 17/29] blkdebug: Implement bdrv_refresh_filename() Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 18/29] blkverify: " Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 19/29] nbd: " Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 20/29] quorum: " Kevin Wolf
2014-08-22 14:51 ` Kevin Wolf [this message]
2014-08-22 14:51 ` [Qemu-devel] [PULL 22/29] block/vvfat.c: remove debugging code to reinit stderr if NULL Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 23/29] block/iscsi: fix memory corruption on iscsi resize Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 24/29] raw-posix: fix O_DIRECT short reads Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 25/29] qemu-iotests: add test case 101 for short file I/O Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 26/29] blkdebug: Delete BH in bdrv_aio_cancel Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 27/29] vmdk: Use bdrv_nb_sectors() where sectors, not bytes are wanted Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 28/29] qemu-img: Allow source cache mode specification Kevin Wolf
2014-08-22 14:51 ` [Qemu-devel] [PULL 29/29] qemu-img: Allow cache mode specification for amend Kevin Wolf
2014-08-22 15:09 ` [Qemu-devel] [PULL 00/29] Block patches Daniel H Barboza
2014-08-22 16:23 ` Peter Maydell

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=1408719113-5316-22-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --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).