From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vo0wA-0000ki-1B for qemu-devel@nongnu.org; Tue, 03 Dec 2013 20:07:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vo0w5-0008Nk-2H for qemu-devel@nongnu.org; Tue, 03 Dec 2013 20:07:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51404) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vo0w4-0008NY-QI for qemu-devel@nongnu.org; Tue, 03 Dec 2013 20:07:28 -0500 From: Fam Zheng Date: Wed, 4 Dec 2013 09:07:03 +0800 Message-Id: <1386119223-15584-7-git-send-email-famz@redhat.com> In-Reply-To: <1386119223-15584-1-git-send-email-famz@redhat.com> References: <1386119223-15584-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v6 6/6] qemu-iotests: Split qcow2 only cases in 048 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , WenchaoXia , stefanha@redhat.com Format "raw" doesn't always work on certain file systems (e.g. tmpfs). Use qcow2 to make the allocation status explicit and split into a new case. Signed-off-by: Fam Zheng Reviewed-by: Wenchao Xia --- tests/qemu-iotests/048 | 27 --------------- tests/qemu-iotests/048.out | 16 --------- tests/qemu-iotests/074 | 86 ++++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/074.out | 18 ++++++++++ 4 files changed, 104 insertions(+), 43 deletions(-) create mode 100644 tests/qemu-iotests/074 create mode 100644 tests/qemu-iotests/074.out diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 index 9def7fc..65da46d 100755 --- a/tests/qemu-iotests/048 +++ b/tests/qemu-iotests/048 @@ -81,32 +81,5 @@ cp "$TEST_IMG" "$TEST_IMG2" io_pattern write 512 512 0 1 101 _compare -# Test cluster allocated in one, with IO error -cat > "$TEST_DIR/blkdebug.conf"<&1 |\ - _filter_testdir | _filter_imgfmt - -# Test cluster allocated in one, with different sizes and IO error in the part -# that exists only in one image -cat > "$TEST_DIR/blkdebug.conf"<&1 |\ - _filter_testdir | _filter_imgfmt - # Cleanup status=0 diff --git a/tests/qemu-iotests/048.out b/tests/qemu-iotests/048.out index d141e05..1aea6eb 100644 --- a/tests/qemu-iotests/048.out +++ b/tests/qemu-iotests/048.out @@ -37,20 +37,4 @@ qemu-io> wrote 512/512 bytes at offset 512 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) qemu-io> Content mismatch at offset 512! 1 -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 -=== IO: pattern 102 -qemu-io> wrote 512/512 bytes at offset 512 -512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io> qemu-img: Error while reading offset 0 of blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error -qemu-img: Error while reading offset 0: Input/output error -4 -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 -Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=0 -=== IO: pattern 102 -qemu-io> wrote 512/512 bytes at offset 512 -512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-io> qemu-img: Error while reading offset 0 of blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error -qemu-img: Error while reading offset 0 of blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error -Warning: Image size mismatch! -4 Cleanup diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074 new file mode 100644 index 0000000..aba126c --- /dev/null +++ b/tests/qemu-iotests/074 @@ -0,0 +1,86 @@ +#!/bin/bash +## +## qemu-img compare test (qcow2 only ones) +## +## +## 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 . +## +# +# creator +owner=famz@redhat.com + +seq=`basename $0` +echo "QA output created by $seq" + +status=1 # failure is the default! + +_cleanup() +{ + echo "Cleanup" + _cleanup_test_img + rm "${TEST_IMG2}" +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_compare() +{ + $QEMU_IMG compare "$@" "$TEST_IMG" "${TEST_IMG2}" + echo $? +} + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.pattern + +_supported_fmt qcow2 +_supported_proto file +_supported_os Linux + +# Setup test basic parameters +TEST_IMG2=$TEST_IMG.2 +CLUSTER_SIZE=4096 +size=1024M + +# Test cluster allocated in one, with IO error +cat > "$TEST_DIR/blkdebug.conf"<&1 |\ + _filter_testdir | _filter_imgfmt + +# Test cluster allocated in one, with different sizes and IO error in the part +# that exists only in one image +cat > "$TEST_DIR/blkdebug.conf"<&1 |\ + _filter_testdir | _filter_imgfmt + +# Cleanup +status=0 diff --git a/tests/qemu-iotests/074.out b/tests/qemu-iotests/074.out new file mode 100644 index 0000000..3deb594 --- /dev/null +++ b/tests/qemu-iotests/074.out @@ -0,0 +1,18 @@ +QA output created by 048 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 +=== IO: pattern 102 +qemu-io> wrote 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +qemu-io> qemu-img: Error while reading offset 0 of blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error +qemu-img: Error while reading offset 0: Input/output error +4 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 +Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=0 +=== IO: pattern 102 +qemu-io> wrote 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +qemu-io> qemu-img: Error while reading offset 0 of blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error +qemu-img: Error while reading offset 0 of blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error +Warning: Image size mismatch! +4 +Cleanup -- 1.8.4.2