Re: [Qemu-devel] [PATCH V4 5/5] qemu-iotests: add test for snapshot in qemu-img convert

[Wenchao Xia <xiawenc@linux.vnet.ibm.com>]

于 2013/11/9 1:18, Jeff Cody 写道:
> On Fri, Oct 11, 2013 at 10:33:31AM +0800, Wenchao Xia wrote:
>> Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
>> ---
>>   tests/qemu-iotests/058     |   19 ++++++++++++++++++-
>>   tests/qemu-iotests/058.out |   12 ++++++++++++
>>   2 files changed, 30 insertions(+), 1 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
>> index 5b821cf..d4987ae 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.
>>   #
>> @@ -33,6 +33,8 @@ status=1	# failure is the default!
>>   nbd_snapshot_port=10850
>>   nbd_snapshot_img="nbd:127.0.0.1:$nbd_snapshot_port"
>>
>> +converted_image=$TEST_IMG.converted
>> +
>>   _export_nbd_snapshot()
>>   {
>>       $QEMU_NBD -v -t -b 127.0.0.1 -p $nbd_snapshot_port "$TEST_IMG" -l $1 &
>> @@ -53,6 +55,7 @@ _cleanup()
>>           kill $NBD_SNAPSHOT_PID
>>       fi
>>       _cleanup_test_img
>> +    rm -f $converted_image
>
> Please quote $converted_image (especially with rm -f) - it is also
> used unquoted later on in this file, as well.
>
>>   }
>>   trap "_cleanup; exit \$status" 0 1 2 3 15
>>
>> @@ -96,6 +99,20 @@ echo "== verifying the exported snapshot with patterns =="
>>   $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
>
> $TEST_IMG needs quoting here, and again below
>

   Thanks for reviewing, will rebase with the quote issue fixed.

>> +
>> +echo
>> +echo "== verifying the converted snapshot with patterns =="
>> +$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 =="
>> +$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 cc4b8ca..a8381b9 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 ==
>> +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 ==
>> +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.7.1
>>
>>
>