qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 05/15] iotests: Add test of recent fix to 'qemu-img measure'
Date: Tue,  1 Aug 2017 16:46:22 +0200	[thread overview]
Message-ID: <20170801144632.3831-6-kwolf@redhat.com> (raw)
In-Reply-To: <20170801144632.3831-1-kwolf@redhat.com>

From: Eric Blake <eblake@redhat.com>

The new test 190 ensures we don't regress back to an infinite loop when
measuring the size of a 2T+ qcow2 image.  I did not append to test 178,
because that test is also designed to run with format 'raw'; also, this
gives us some coverage of the measure command under the quick group.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/190     | 59 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/190.out | 11 +++++++++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 71 insertions(+)
 create mode 100755 tests/qemu-iotests/190
 create mode 100644 tests/qemu-iotests/190.out

diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
new file mode 100755
index 0000000000..8f808fef5d
--- /dev/null
+++ b/tests/qemu-iotests/190
@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+# qemu-img measure sub-command tests on huge qcow2 files
+#
+# Copyright (C) 2017 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=eblake@redhat.com
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+here=`pwd`
+status=1    # failure is the default!
+
+_cleanup()
+{
+    _cleanup_test_img
+    rm -f "$TEST_IMG.converted"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+. ./common.pattern
+
+# See 178 for more extensive tests across more formats
+_supported_fmt qcow2
+_supported_proto file
+_supported_os Linux
+
+echo "== Huge file =="
+echo
+
+IMGOPTS='cluster_size=2M' _make_test_img 2T
+
+$QEMU_IMG measure -O raw -f qcow2 "$TEST_IMG"
+$QEMU_IMG measure -O qcow2 -o cluster_size=64k -f qcow2 "$TEST_IMG"
+$QEMU_IMG measure -O qcow2 -o cluster_size=2M -f qcow2 "$TEST_IMG"
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/190.out b/tests/qemu-iotests/190.out
new file mode 100644
index 0000000000..d001942002
--- /dev/null
+++ b/tests/qemu-iotests/190.out
@@ -0,0 +1,11 @@
+QA output created by 190
+== Huge file ==
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2199023255552
+required size: 2199023255552
+fully allocated size: 2199023255552
+required size: 335806464
+fully allocated size: 2199359062016
+required size: 18874368
+fully allocated size: 2199042129920
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 287f0ea27d..823811076d 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -184,3 +184,4 @@
 186 rw auto
 188 rw auto quick
 189 rw auto
+190 rw auto quick
-- 
2.13.3

  parent reply	other threads:[~2017-08-01 14:46 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-01 14:46 [Qemu-devel] [PULL 00/15] Block layer patches for 2.10.0-rc1 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 01/15] docs: add qemu-block-drivers(7) man page Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 02/15] iotests: Fix test 156 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 03/15] iotests: Redirect stderr to stdout in 186 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 04/15] iotests: Check dirty bitmap statistics in 124 Kevin Wolf
2017-08-01 14:46 ` Kevin Wolf [this message]
2017-08-01 14:46 ` [Qemu-devel] [PULL 06/15] block: fix dangling bs->explicit_options in block.c Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 07/15] block: fix leaks in bdrv_open_driver() Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 08/15] qemu-iotests/041: Fix leaked scratch images Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 09/15] qemu-iotests: Remove blkdebug.conf after tests Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 10/15] qemu-iotests/141: Fix image cleanup Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 11/15] qemu-iotests/153: Fix leaked scratch images Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 12/15] qemu-iotests/162: Fix leaked temporary files Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 13/15] qemu-iotests/063: Fix leaked image Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 14/15] qemu-iotests/059: Fix leaked image files Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 15/15] block/qapi: Remove redundant NULL check to silence Coverity Kevin Wolf
2017-08-01 16:01 ` [Qemu-devel] [PULL 00/15] Block layer patches for 2.10.0-rc1 Peter Maydell
2017-08-01 16:10   ` Kevin Wolf

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=20170801144632.3831-6-kwolf@redhat.com \
    --to=kwolf@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).