From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 24/48] qemu-iotests: Test reopen with node-name/driver options
Date: Fri, 18 Dec 2015 16:07:30 +0100 [thread overview]
Message-ID: <1450451274-7472-25-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1450451274-7472-1-git-send-email-kwolf@redhat.com>
'node-name' and 'driver' should not be changed during a reopen
operation. It is, however, valid to specify them with the same value as
they already had.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/133 | 90 ++++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/133.out | 22 ++++++++++++
tests/qemu-iotests/group | 1 +
3 files changed, 113 insertions(+)
create mode 100755 tests/qemu-iotests/133
create mode 100644 tests/qemu-iotests/133.out
diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133
new file mode 100755
index 0000000..8587102
--- /dev/null
+++ b/tests/qemu-iotests/133
@@ -0,0 +1,90 @@
+#!/bin/bash
+#
+# Test for reopen
+#
+# Copyright (C) 2015 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=kwolf@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
+
+TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+_make_test_img -b "$TEST_IMG.base"
+
+echo
+echo "=== Check that node-name can't be changed ==="
+echo
+
+$QEMU_IO -c 'reopen -o node-name=foo' $TEST_IMG
+$QEMU_IO -c 'reopen -o file.node-name=foo' $TEST_IMG
+$QEMU_IO -c 'reopen -o backing.node-name=foo' $TEST_IMG
+
+echo
+echo "=== Check that unchanged node-name is okay ==="
+echo
+
+# Explicitly repeated
+$QEMU_IO -c "open -o node-name=foo $TEST_IMG" -c 'reopen -o node-name=foo'
+$QEMU_IO -c "open -o file.node-name=foo $TEST_IMG" -c 'reopen -o file.node-name=foo'
+$QEMU_IO -c "open -o backing.node-name=foo $TEST_IMG" -c 'reopen -o backing.node-name=foo'
+
+# Implicitly retained
+$QEMU_IO -c "open -o node-name=foo $TEST_IMG" -c 'reopen'
+$QEMU_IO -c "open -o file.node-name=foo $TEST_IMG" -c 'reopen'
+$QEMU_IO -c "open -o backing.node-name=foo $TEST_IMG" -c 'reopen'
+
+echo
+echo "=== Check that driver can't be changed ==="
+echo
+
+$QEMU_IO -c 'reopen -o driver=raw' $TEST_IMG
+$QEMU_IO -c 'reopen -o file.driver=qcow2' $TEST_IMG
+$QEMU_IO -c 'reopen -o backing.driver=file' $TEST_IMG
+
+echo
+echo "=== Check that unchanged driver is okay ==="
+echo
+
+# Explicitly repeated (implicit case is covered in node-name test)
+$QEMU_IO -c 'reopen -o driver=qcow2' $TEST_IMG
+$QEMU_IO -c 'reopen -o file.driver=file' $TEST_IMG
+$QEMU_IO -c 'reopen -o backing.driver=qcow2' $TEST_IMG
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out
new file mode 100644
index 0000000..cc86b94
--- /dev/null
+++ b/tests/qemu-iotests/133.out
@@ -0,0 +1,22 @@
+QA output created by 133
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base
+
+=== Check that node-name can't be changed ===
+
+Cannot change the option 'node-name'
+Cannot change the option 'node-name'
+Cannot change the option 'node-name'
+
+=== Check that unchanged node-name is okay ===
+
+
+=== Check that driver can't be changed ===
+
+Cannot change the option 'driver'
+Cannot change the option 'driver'
+Cannot change the option 'driver'
+
+=== Check that unchanged driver is okay ===
+
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index ed6ce09..d6e9219 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -134,6 +134,7 @@
130 rw auto quick
131 rw auto quick
132 rw auto quick
+133 auto quick
134 rw auto quick
135 rw auto
136 rw auto
--
1.8.3.1
next prev parent reply other threads:[~2015-12-18 15:08 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-18 15:07 [Qemu-devel] [PULL 00/48] Block patches Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 01/48] iotests: 124: Split into two test classes Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 02/48] iotests: 124: move incremental failure test Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 03/48] iotests: 124: don't reopen qcow2 Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 04/48] qcow2: Add .bdrv_join_options callback Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 05/48] block: Fix reopen with semantically overlapping options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 06/48] mirror: Error out when a BDS would get two BBs Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 07/48] block: Allow references for backing files Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 08/48] block: Consider all block layer options in append_open_options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 09/48] block: Exclude nested options only for children in append_open_options() Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 10/48] block: Pass driver-specific options to .bdrv_refresh_filename() Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 11/48] block: Keep "driver" in bs->options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 12/48] block: Allow specifying child options in reopen Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 13/48] block: reopen: Document option precedence and refactor accordingly Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 14/48] block: Add infrastructure for option inheritance Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 15/48] block: Split out parse_json_protocol() Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 16/48] block: Introduce bs->explicit_options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 17/48] blockdev: Set 'format' indicates non-empty drive Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 18/48] qemu-iotests: Remove cache mode test without medium Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 19/48] block: reopen: Extract QemuOpts for generic block layer options Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 20/48] block: Move cache options into options QDict Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 21/48] blkdebug: Enable reopen Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 22/48] qemu-iotests: Try setting cache mode for children Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 23/48] qemu-iotests: Test cache mode option inheritance Kevin Wolf
2015-12-18 15:07 ` Kevin Wolf [this message]
2015-12-18 15:07 ` [Qemu-devel] [PULL 25/48] progress: Allow regressing progress Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 26/48] block: Add opaque value to the amend CB Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 27/48] qcow2: Use error_report() in qcow2_amend_options() Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 28/48] qcow2: Use abort() instead of assert(false) Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 29/48] qcow2: Split upgrade/downgrade paths for amend Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 30/48] qcow2: Use intermediate helper CB " Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 31/48] qcow2: Add function for refcount order amendment Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 32/48] qcow2: Invoke refcount order amendment function Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 33/48] qcow2: Point to amend function in check Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 34/48] iotests: Extend test 112 for qemu-img amend Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 35/48] qcow2: insert assert into qcow2_get_specific_info() Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 36/48] raw-posix: Make aio=native option binding Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 37/48] block: Remove prototype of bdrv_swap from header Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 38/48] iotests: Update comments for bdrv_swap() in 094 Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 39/48] block: use drained section around bdrv_snapshot_delete Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 40/48] block: fix bdrv_ioctl called from coroutine Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 41/48] qemu-iotests: refine common.config Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 42/48] qemu-iotests: s390x: fix test 051 Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 43/48] qemu-iotests: s390x: fix test 068 Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 44/48] block/qapi: do not redundantly print "actual path" Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 45/48] block/qapi: always report full_backing_filename Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 46/48] block/qapi: explicitly warn if !has_full_backing_filename Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 47/48] qemu-img: abort when full_backing_filename not present Kevin Wolf
2015-12-18 15:07 ` [Qemu-devel] [PULL 48/48] block/qapi: allow best-effort query Kevin Wolf
2015-12-18 17:04 ` [Qemu-devel] [PULL 00/48] Block patches 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=1450451274-7472-25-git-send-email-kwolf@redhat.com \
--to=kwolf@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).