From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoyQ3-00008j-Ns for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:38:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VoyPx-0003rt-9S for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:38:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoyPw-0003rb-NS for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:38:16 -0500 From: Stefan Hajnoczi Date: Fri, 6 Dec 2013 17:36:34 +0100 Message-Id: <1386347807-27359-36-git-send-email-stefanha@redhat.com> In-Reply-To: <1386347807-27359-1-git-send-email-stefanha@redhat.com> References: <1386347807-27359-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 35/48] qemu-iotests: add test for snapshot in qemu-img convert List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Wenchao Xia , Anthony Liguori From: Wenchao Xia Signed-off-by: Wenchao Xia Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/058 | 19 ++++++++++++++++++- tests/qemu-iotests/058.out | 12 ++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index cf50857..14584cd 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -1,6 +1,6 @@ #!/bin/bash # -# Test export internal snapshot by qemu-nbd. +# Test export internal snapshot by qemu-nbd, convert it by qemu-img. # # Copyright (C) 2013 IBM, Inc. # @@ -54,6 +54,8 @@ _wait_for_nbd() exit 1 } +converted_image=$TEST_IMG.converted + _export_nbd_snapshot() { _cleanup_nbd @@ -74,6 +76,7 @@ _cleanup() { _cleanup_nbd _cleanup_test_img + rm -f "$converted_image" } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -115,6 +118,20 @@ echo "== verifying the exported snapshot with patterns, method 2 ==" $QEMU_IO -c 'read -P 0xa 0x1000 0x1000' "$nbd_snapshot_img" | _filter_qemu_io $QEMU_IO -c 'read -P 0xb 0x2000 0x1000' "$nbd_snapshot_img" | _filter_qemu_io +$QEMU_IMG convert "$TEST_IMG" -l sn1 -O qcow2 "$converted_image" + +echo +echo "== verifying the converted snapshot with patterns, method 1 ==" +$QEMU_IO -c 'read -P 0xa 0x1000 0x1000' "$converted_image" | _filter_qemu_io +$QEMU_IO -c 'read -P 0xb 0x2000 0x1000' "$converted_image" | _filter_qemu_io + +$QEMU_IMG convert "$TEST_IMG" -l snapshot.name=sn1 -O qcow2 "$converted_image" + +echo +echo "== verifying the converted snapshot with patterns, method 2 ==" +$QEMU_IO -c 'read -P 0xa 0x1000 0x1000' "$converted_image" | _filter_qemu_io +$QEMU_IO -c 'read -P 0xb 0x2000 0x1000' "$converted_image" | _filter_qemu_io + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/058.out b/tests/qemu-iotests/058.out index 768ac61..9a69379 100644 --- a/tests/qemu-iotests/058.out +++ b/tests/qemu-iotests/058.out @@ -29,4 +29,16 @@ read 4096/4096 bytes at offset 4096 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 4096/4096 bytes at offset 8192 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +== verifying the converted snapshot with patterns, method 1 == +read 4096/4096 bytes at offset 4096 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 4096/4096 bytes at offset 8192 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +== verifying the converted snapshot with patterns, method 2 == +read 4096/4096 bytes at offset 4096 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 4096/4096 bytes at offset 8192 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done -- 1.8.4.2