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 04/19] qemu-iotests: Test progress output for conversion
Date: Fri,  7 Mar 2014 14:32:52 +0100	[thread overview]
Message-ID: <1394199187-9576-5-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1394199187-9576-1-git-send-email-kwolf@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/086     | 65 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/086.out | 18 +++++++++++++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 84 insertions(+)
 create mode 100755 tests/qemu-iotests/086
 create mode 100644 tests/qemu-iotests/086.out

diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086
new file mode 100755
index 0000000..48fe85b
--- /dev/null
+++ b/tests/qemu-iotests/086
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Test qemu-img progress output
+#
+# 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=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
+
+function run_qemu_img()
+{
+    echo
+    echo Testing: "$@" | _filter_testdir
+}
+
+size=128M
+
+_make_test_img $size
+$QEMU_IO -c 'write 0 1M' $TEST_IMG | _filter_qemu_io
+$QEMU_IO -c 'write 2M 1M' $TEST_IMG | _filter_qemu_io
+$QEMU_IO -c 'write 4M 1M' $TEST_IMG | _filter_qemu_io
+$QEMU_IO -c 'write 32M 1M' $TEST_IMG | _filter_qemu_io
+
+$QEMU_IMG convert -p -O $IMGFMT -f $IMGFMT "$TEST_IMG" "$TEST_IMG".base  2>&1 |\
+    _filter_testdir | sed -e 's/\r/\n/g'
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/086.out b/tests/qemu-iotests/086.out
new file mode 100644
index 0000000..9c0bf23
--- /dev/null
+++ b/tests/qemu-iotests/086.out
@@ -0,0 +1,18 @@
+QA output created by 086
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 
+wrote 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 1048576/1048576 bytes at offset 2097152
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 1048576/1048576 bytes at offset 4194304
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 1048576/1048576 bytes at offset 33554432
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+    (0.00/100%)
+    (25.00/100%)
+    (50.00/100%)
+    (75.00/100%)
+    (100.00/100%)
+    (100.00/100%)
+
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 8dd8553..901730d 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -85,3 +85,4 @@
 079 rw auto
 081 rw auto
 082 rw auto quick
+086 rw auto quick
-- 
1.8.1.4

  parent reply	other threads:[~2014-03-07 13:33 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-07 13:32 [Qemu-devel] [PULL 00/19] Block patches Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 01/19] gluster: Change licence to GPLv2+ Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 02/19] gluster: Remove unused defines and header include Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 03/19] qemu-img convert: Fix progress output Kevin Wolf
2014-03-07 13:32 ` Kevin Wolf [this message]
2014-03-07 13:32 ` [Qemu-devel] [PULL 05/19] iscsi: Use bs->sg for everything else than disks Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 06/19] block: Fix bs->request_alignment assertion for bs->sg=1 Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 07/19] block: make bdrv_swap rebuild the bs graph node list field Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 08/19] block: mirror - remove code cruft that has no function Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 09/19] block: Keep "filename" option after parsing Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 10/19] block/raw-posix: Implement bdrv_parse_filename() Kevin Wolf
2014-03-07 13:32 ` [Qemu-devel] [PULL 11/19] block/raw-posix: Strip "file:" prefix on creation Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 12/19] block/raw-win32: Implement bdrv_parse_filename() Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 13/19] block/raw-win32: Strip "file:" prefix on creation Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 14/19] blockdev: Fail blockdev-add with encrypted images Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 15/19] blockdev: Fix NULL pointer dereference in blockdev-add Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 16/19] qemu-iotests: Test a few blockdev-add error cases Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 17/19] block: Fix error path segfault in bdrv_open() Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 18/19] hw/ide/ahci.h: Avoid shifting left into sign bit Kevin Wolf
2014-03-07 13:33 ` [Qemu-devel] [PULL 19/19] block: qemu-iotests 085 - live snapshots tests Kevin Wolf
2014-03-08 12:40 ` [Qemu-devel] [PULL 00/19] 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=1394199187-9576-5-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).