From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL 07/15] iotests: Keep testing broken relative extent paths
Date: Tue, 27 Aug 2019 20:23:05 +0200 [thread overview]
Message-ID: <20190827182313.25983-8-mreitz@redhat.com> (raw)
In-Reply-To: <20190827182313.25983-1-mreitz@redhat.com>
We had a test for a case where relative extent paths did not work, but
unfortunately we just fixed the underlying problem, so it works now.
This patch adds a new test case that still fails.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20190815153638.4600-4-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/059 | 27 +++++++++++++++++++++++++++
tests/qemu-iotests/059.out | 4 ++++
2 files changed, 31 insertions(+)
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index fbed5f9483..10bfbaecec 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -114,6 +114,8 @@ $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2
echo
echo "=== Testing monolithicFlat with internally generated JSON file name ==="
+
+echo '--- blkdebug ---'
# Should work, because bdrv_dirname() works fine with blkdebug
IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
@@ -122,6 +124,31 @@ $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TE
| _filter_testdir | _filter_imgfmt | _filter_img_info
_cleanup_test_img
+echo '--- quorum ---'
+# Should not work, because bdrv_dirname() does not work with quorum
+IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
+cp "$TEST_IMG" "$TEST_IMG.orig"
+
+filename="json:{
+ \"driver\": \"$IMGFMT\",
+ \"file\": {
+ \"driver\": \"quorum\",
+ \"children\": [ {
+ \"driver\": \"file\",
+ \"filename\": \"$TEST_IMG\"
+ }, {
+ \"driver\": \"file\",
+ \"filename\": \"$TEST_IMG.orig\"
+ } ],
+ \"vote-threshold\": 1
+ } }"
+
+filename=$(echo "$filename" | tr '\n' ' ' | sed -e 's/\s\+/ /g')
+$QEMU_IMG info "$filename" 2>&1 \
+ | sed -e "s/'json:[^']*'/\$QUORUM_FILE/g" \
+ | _filter_testdir | _filter_imgfmt | _filter_img_info
+
+
echo
echo "=== Testing version 3 ==="
_use_sample_img iotest-version3.vmdk.bz2
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index a51b571d27..39bf7e211d 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -2049,10 +2049,14 @@ wrote 512/512 bytes at offset 10240
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
=== Testing monolithicFlat with internally generated JSON file name ===
+--- blkdebug ---
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
format name: IMGFMT
cluster size: 0 bytes
vm state offset: 0 bytes
+--- quorum ---
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+qemu-img: Could not open $QUORUM_FILE: Cannot use relative paths with VMDK descriptor file $QUORUM_FILE: Cannot generate a base directory for quorum nodes
=== Testing version 3 ===
image: TEST_DIR/iotest-version3.IMGFMT
--
2.21.0
next prev parent reply other threads:[~2019-08-27 18:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 18:22 [Qemu-devel] [PULL 00/15] Block patches Max Reitz
2019-08-27 18:22 ` [Qemu-devel] [PULL 01/15] qemu-io: add pattern file for write command Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 02/15] block: fix permission update in bdrv_replace_node Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 03/15] block: posix: Always allocate the first block Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 04/15] iotests: Test allocate_first_block() with O_DIRECT Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 05/15] iotests: Fix _filter_img_create() Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 06/15] vmdk: Use bdrv_dirname() for relative extent paths Max Reitz
2019-08-27 18:23 ` Max Reitz [this message]
2019-08-27 18:23 ` [Qemu-devel] [PULL 08/15] vmdk: Reject invalid compressed writes Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 09/15] iotests: Disable broken streamOptimized tests Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 10/15] iotests: Disable 110 for vmdk.twoGbMaxExtentSparse Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 11/15] iotests: Disable 126 for flat vmdk subformats Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 12/15] file-posix: fix request_alignment typo Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 13/15] iotests: Check for enabled drivers before testing them Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 14/15] tests/check-block: Skip iotests when sanitizers are enabled Max Reitz
2019-08-27 18:23 ` [Qemu-devel] [PULL 15/15] iotests: Unify cache mode quoting Max Reitz
2019-09-03 8:39 ` [Qemu-devel] [PULL 00/15] Block patches Peter Maydell
2019-09-03 12:50 ` Max Reitz
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=20190827182313.25983-8-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=peter.maydell@linaro.org \
--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).