From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlGBp-0006O4-AU for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:52:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlGBk-0000rh-Iq for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:52:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlGBk-0000rY-BH for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:52:48 -0500 From: Stefan Hajnoczi Date: Mon, 3 Nov 2014 11:50:45 +0000 Message-Id: <1415015456-25086-43-git-send-email-stefanha@redhat.com> In-Reply-To: <1415015456-25086-1-git-send-email-stefanha@redhat.com> References: <1415015456-25086-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 42/53] iotests: Expand test 061 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Max Reitz From: Max Reitz Add some tests for progress output to 061. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Beno=C3=AEt Canet Reviewed-by: Kevin Wolf Reviewed-by: Benoit Canet Message-id: 1414404776-4919-8-git-send-email-mreitz@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/061 | 25 +++++++++++++++++++++++++ tests/qemu-iotests/061.out | 30 ++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 2 +- 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index ab98def..8d37f8a 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -209,6 +209,31 @@ $QEMU_IMG amend -o "compat=3D0.10" "$TEST_IMG" _check_test_img $QEMU_IO -c "read -P 0 0 64M" "$TEST_IMG" | _filter_qemu_io =20 +echo +echo "=3D=3D=3D Testing progress report without snapshot =3D=3D=3D" +echo +IMGOPTS=3D"compat=3D1.1" TEST_IMG=3D"$TEST_IMG.base" _make_test_img 4G +IMGOPTS=3D"compat=3D1.1" _make_test_img -b "$TEST_IMG.base" 4G +$QEMU_IO -c "write -z 0 64k" \ + -c "write -z 1G 64k" \ + -c "write -z 2G 64k" \ + -c "write -z 3G 64k" "$TEST_IMG" | _filter_qemu_io +$QEMU_IMG amend -p -o "compat=3D0.10" "$TEST_IMG" +_check_test_img + +echo +echo "=3D=3D=3D Testing progress report with snapshot =3D=3D=3D" +echo +IMGOPTS=3D"compat=3D1.1" TEST_IMG=3D"$TEST_IMG.base" _make_test_img 4G +IMGOPTS=3D"compat=3D1.1" _make_test_img -b "$TEST_IMG.base" 4G +$QEMU_IO -c "write -z 0 64k" \ + -c "write -z 1G 64k" \ + -c "write -z 2G 64k" \ + -c "write -z 3G 64k" "$TEST_IMG" | _filter_qemu_io +$QEMU_IMG snapshot -c foo "$TEST_IMG" +$QEMU_IMG amend -p -o "compat=3D0.10" "$TEST_IMG" +_check_test_img + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out index 4ae6472..9045544 100644 --- a/tests/qemu-iotests/061.out +++ b/tests/qemu-iotests/061.out @@ -390,4 +390,34 @@ wrote 67108864/67108864 bytes at offset 0 No errors were found on the image. read 67108864/67108864 bytes at offset 0 64 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=3D=3D=3D Testing progress report without snapshot =3D=3D=3D + +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D4294967296=20 +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D4294967296 backing_f= ile=3D'TEST_DIR/t.IMGFMT.base'=20 +wrote 65536/65536 bytes at offset 0 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 1073741824 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 2147483648 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 3221225472 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + (0.00/100%)=0D (12.50/100%)=0D (25.00/100%)=0D (37.50/100%)= =0D (50.00/100%)=0D (62.50/100%)=0D (75.00/100%)=0D (87.50/10= 0%)=0D (100.00/100%)=0D (100.00/100%) +No errors were found on the image. + +=3D=3D=3D Testing progress report with snapshot =3D=3D=3D + +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D4294967296=20 +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D4294967296 backing_f= ile=3D'TEST_DIR/t.IMGFMT.base'=20 +wrote 65536/65536 bytes at offset 0 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 1073741824 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 2147483648 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 3221225472 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + (0.00/100%)=0D (6.25/100%)=0D (12.50/100%)=0D (18.75/100%)=0D= (25.00/100%)=0D (31.25/100%)=0D (37.50/100%)=0D (43.75/100%)= =0D (50.00/100%)=0D (56.25/100%)=0D (62.50/100%)=0D (68.75/10= 0%)=0D (75.00/100%)=0D (81.25/100%)=0D (87.50/100%)=0D (93.75= /100%)=0D (100.00/100%)=0D (100.00/100%) +No errors were found on the image. *** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 281c889..7b2c666 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -67,7 +67,7 @@ 058 rw auto quick 059 rw auto quick 060 rw auto quick -061 rw auto quick +061 rw auto 062 rw auto quick 063 rw auto quick 064 rw auto quick --=20 1.9.3