From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 20/20] qemu-iotests: add 053 unaligned compressed image size test
Date: Mon, 22 Apr 2013 13:31:34 +0200 [thread overview]
Message-ID: <1366630294-18984-21-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1366630294-18984-1-git-send-email-kwolf@redhat.com>
From: Stefan Hajnoczi <stefanha@redhat.com>
Test that qemu-img convert -c works when input image length is not a
multiple of the cluster size.
Previously an error message would be produced:
qemu-img: error while compressing sector 0: Input/output error
Now that qcow2 and qcow handle this case the test passes successfully.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/053 | 73 ++++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/053.out | 17 +++++++++++
tests/qemu-iotests/group | 1 +
3 files changed, 91 insertions(+)
create mode 100755 tests/qemu-iotests/053
create mode 100644 tests/qemu-iotests/053.out
diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
new file mode 100755
index 0000000..bc56992
--- /dev/null
+++ b/tests/qemu-iotests/053
@@ -0,0 +1,73 @@
+#!/bin/bash
+#
+# Test qemu-img convert when image length is not a multiple of cluster size
+#
+# Copyright (C) 2013 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=stefanha@redhat.com
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+
+_cleanup()
+{
+ rm -f $TEST_IMG.orig
+ _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 qcow
+_supported_proto file
+_supported_os Linux
+
+echo
+echo "== Creating single sector image =="
+
+_make_test_img 512
+$QEMU_IO -c "write -P0xa 0 512" $TEST_IMG | _filter_qemu_io
+mv $TEST_IMG $TEST_IMG.orig
+
+echo
+echo "== Converting the image, compressed =="
+
+$QEMU_IMG convert -c -O $IMGFMT $TEST_IMG.orig $TEST_IMG
+_check_test_img
+
+echo
+echo "== Checking compressed image virtual disk size =="
+
+_img_info | grep '^virtual size:'
+
+echo
+echo "== Verifying the compressed image =="
+
+$QEMU_IO -c "read -P0xa 0 512" $TEST_IMG | _filter_qemu_io
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
+
diff --git a/tests/qemu-iotests/053.out b/tests/qemu-iotests/053.out
new file mode 100644
index 0000000..16464e6
--- /dev/null
+++ b/tests/qemu-iotests/053.out
@@ -0,0 +1,17 @@
+QA output created by 053
+
+== Creating single sector image ==
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=512
+wrote 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+== Converting the image, compressed ==
+No errors were found on the image.
+
+== Checking compressed image virtual disk size ==
+virtual size: 512 (512 bytes)
+
+== Verifying the compressed image ==
+read 512/512 bytes at offset 0
+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 324bacb..68eabda 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -59,3 +59,4 @@
050 rw auto backing quick
051 rw auto
052 rw auto backing
+053 rw auto
--
1.8.1.4
prev parent reply other threads:[~2013-04-22 11:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-22 11:31 [Qemu-devel] [PULL 00/20] Block patches Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 01/20] qcow2: allow sub-cluster compressed write to last cluster Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 02/20] qcow: " Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 03/20] qemu-img: do not zero-pad the compressed write buffer Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 04/20] qemu-iotests: Fix _filter_qemu Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 05/20] block: Fail gracefully when using a format driver on protocol level Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 06/20] block: Add driver-specific options for backing files Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 07/20] block: Enable filename option Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 08/20] raw-posix: Use bdrv_open options instead of filename Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 09/20] raw-win32: " Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 10/20] blkdebug: " Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 11/20] blkverify: " Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 12/20] curl: " Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 13/20] gluster: " Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 14/20] iscsi: " Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 15/20] rbd: " Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 16/20] sheepdog: " Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 17/20] vvfat: " Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 18/20] block: Remove filename parameter from .bdrv_file_open() Kevin Wolf
2013-04-22 11:31 ` [Qemu-devel] [PATCH 19/20] block: Allow overriding backing.file.filename Kevin Wolf
2013-04-22 11:31 ` Kevin Wolf [this message]
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=1366630294-18984-21-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=anthony@codemonkey.ws \
--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).