Patchwork [v3,6/6] qemu-iotests: Additional info from qemu-img info

login
register
mail settings
Submitter Max Reitz
Date Sept. 10, 2013, 9:33 a.m.
Message ID <1378805602-24044-7-git-send-email-mreitz@redhat.com>
Download mbox | patch
Permalink /patch/273798/
State New
Headers show

Comments

Max Reitz - Sept. 10, 2013, 9:33 a.m.
Add a test for the additional information now provided by qemu-img info
when used on qcow2 images.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/064     | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/064.out | 22 ++++++++++++++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 95 insertions(+)
 create mode 100755 tests/qemu-iotests/064
 create mode 100644 tests/qemu-iotests/064.out
Fam Zheng - Sept. 11, 2013, 6:23 a.m.
On Tue, 09/10 11:33, Max Reitz wrote:
> Add a test for the additional information now provided by qemu-img info
> when used on qcow2 images.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/064     | 72 ++++++++++++++++++++++++++++++++++++++++++++++
>  tests/qemu-iotests/064.out | 22 ++++++++++++++
>  tests/qemu-iotests/group   |  1 +
>  3 files changed, 95 insertions(+)
>  create mode 100755 tests/qemu-iotests/064
>  create mode 100644 tests/qemu-iotests/064.out
> 
> diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064
> new file mode 100755
> index 0000000..4979db5
> --- /dev/null
> +++ b/tests/qemu-iotests/064
> @@ -0,0 +1,72 @@
> +#!/bin/bash
> +#
> +# Test for additional information emitted by qemu-img info on qcow2
> +# images
> +#
> +# 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 <http://www.gnu.org/licenses/>.
> +#
> +
> +# creator
> +owner=mreitz@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
> +
> +# This tests qocw2-specific low-level functionality
> +_supported_fmt qcow2
> +_supported_proto generic
> +_supported_os Linux
> +
> +IMG_SIZE=64M
> +
> +echo
> +echo "=== Testing qcow2 image with -o compat=0.10 ==="
> +echo
> +IMGOPTS="compat=0.10" _make_test_img $IMG_SIZE
> +# don't use _img_info, since that function will filter out the
> +# additional information we're about to test for
> +$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42

For curiosity, where's 42 from?

Fam

> +
> +echo
> +echo "=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=off ==="
> +echo
> +IMGOPTS="compat=1.1,lazy_refcounts=off" _make_test_img $IMG_SIZE
> +$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42
> +
> +echo
> +echo "=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=on ==="
> +echo
> +IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img $IMG_SIZE
> +$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42
> +
> +# success, all done
> +echo "*** done"
> +rm -f $seq.full
> +status=0
> diff --git a/tests/qemu-iotests/064.out b/tests/qemu-iotests/064.out
> new file mode 100644
> index 0000000..6ce5b43
> --- /dev/null
> +++ b/tests/qemu-iotests/064.out
> @@ -0,0 +1,22 @@
> +QA output created by 064
> +
> +=== Testing qcow2 image with -o compat=0.10 ===
> +
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
> +Format specific information:
> +compat: 0.10
> +
> +=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=off ===
> +
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
> +Format specific information:
> +compat: 1.1
> +lazy refcounts: false
> +
> +=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=on ===
> +
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
> +Format specific information:
> +compat: 1.1
> +lazy refcounts: true
> +*** done
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index b696242..740cd84 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -66,3 +66,4 @@
>  059 rw auto
>  060 rw auto
>  062 rw auto
> +064 rw auto
> -- 
> 1.8.3.1
>
Max Reitz - Sept. 11, 2013, 7:26 a.m.
On 2013-09-11 08:23, Fam Zheng wrote:
> On Tue, 09/10 11:33, Max Reitz wrote:
>> Add a test for the additional information now provided by qemu-img info
>> when used on qcow2 images.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>>   tests/qemu-iotests/064     | 72 ++++++++++++++++++++++++++++++++++++++++++++++
>>   tests/qemu-iotests/064.out | 22 ++++++++++++++
>>   tests/qemu-iotests/group   |  1 +
>>   3 files changed, 95 insertions(+)
>>   create mode 100755 tests/qemu-iotests/064
>>   create mode 100644 tests/qemu-iotests/064.out
>>
>> diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064
>> new file mode 100755
>> index 0000000..4979db5
>> --- /dev/null
>> +++ b/tests/qemu-iotests/064
>> @@ -0,0 +1,72 @@
>> +#!/bin/bash
>> +#
>> +# Test for additional information emitted by qemu-img info on qcow2
>> +# images
>> +#
>> +# 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 <http://www.gnu.org/licenses/>.
>> +#
>> +
>> +# creator
>> +owner=mreitz@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
>> +
>> +# This tests qocw2-specific low-level functionality
>> +_supported_fmt qcow2
>> +_supported_proto generic
>> +_supported_os Linux
>> +
>> +IMG_SIZE=64M
>> +
>> +echo
>> +echo "=== Testing qcow2 image with -o compat=0.10 ==="
>> +echo
>> +IMGOPTS="compat=0.10" _make_test_img $IMG_SIZE
>> +# don't use _img_info, since that function will filter out the
>> +# additional information we're about to test for
>> +$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42
> For curiosity, where's 42 from?
I want to read all format specific information there, and because this 
is the last information emitted by qemu_img -info, I have to grep 
everything after the line "Format specific information:" until EOF – I 
didn't find an easy way to do this, so I just chose a number of lines 
which seemed enough to fetch all of that format specific info 
(currently, 2 would suffice).

> Fam
>
>> +
>> +echo
>> +echo "=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=off ==="
>> +echo
>> +IMGOPTS="compat=1.1,lazy_refcounts=off" _make_test_img $IMG_SIZE
>> +$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42
>> +
>> +echo
>> +echo "=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=on ==="
>> +echo
>> +IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img $IMG_SIZE
>> +$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42
>> +
>> +# success, all done
>> +echo "*** done"
>> +rm -f $seq.full
>> +status=0
>> diff --git a/tests/qemu-iotests/064.out b/tests/qemu-iotests/064.out
>> new file mode 100644
>> index 0000000..6ce5b43
>> --- /dev/null
>> +++ b/tests/qemu-iotests/064.out
>> @@ -0,0 +1,22 @@
>> +QA output created by 064
>> +
>> +=== Testing qcow2 image with -o compat=0.10 ===
>> +
>> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
>> +Format specific information:
>> +compat: 0.10
>> +
>> +=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=off ===
>> +
>> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
>> +Format specific information:
>> +compat: 1.1
>> +lazy refcounts: false
>> +
>> +=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=on ===
>> +
>> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
>> +Format specific information:
>> +compat: 1.1
>> +lazy refcounts: true
>> +*** done
>> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
>> index b696242..740cd84 100644
>> --- a/tests/qemu-iotests/group
>> +++ b/tests/qemu-iotests/group
>> @@ -66,3 +66,4 @@
>>   059 rw auto
>>   060 rw auto
>>   062 rw auto
>> +064 rw auto
>> -- 
>> 1.8.3.1
>>

Max
Fam Zheng - Sept. 11, 2013, 7:44 a.m.
On Wed, 09/11 09:26, Max Reitz wrote:
> On 2013-09-11 08:23, Fam Zheng wrote:
> >On Tue, 09/10 11:33, Max Reitz wrote:
> >>Add a test for the additional information now provided by qemu-img info
> >>when used on qcow2 images.
> >>
> >>Signed-off-by: Max Reitz <mreitz@redhat.com>
> >>---
> >>  tests/qemu-iotests/064     | 72 ++++++++++++++++++++++++++++++++++++++++++++++
> >>  tests/qemu-iotests/064.out | 22 ++++++++++++++
> >>  tests/qemu-iotests/group   |  1 +
> >>  3 files changed, 95 insertions(+)
> >>  create mode 100755 tests/qemu-iotests/064
> >>  create mode 100644 tests/qemu-iotests/064.out
> >>
> >>diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064
> >>new file mode 100755
> >>index 0000000..4979db5
> >>--- /dev/null
> >>+++ b/tests/qemu-iotests/064
> >>@@ -0,0 +1,72 @@
> >>+#!/bin/bash
> >>+#
> >>+# Test for additional information emitted by qemu-img info on qcow2
> >>+# images
> >>+#
> >>+# 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 <http://www.gnu.org/licenses/>.
> >>+#
> >>+
> >>+# creator
> >>+owner=mreitz@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
> >>+
> >>+# This tests qocw2-specific low-level functionality
> >>+_supported_fmt qcow2
> >>+_supported_proto generic
> >>+_supported_os Linux
> >>+
> >>+IMG_SIZE=64M
> >>+
> >>+echo
> >>+echo "=== Testing qcow2 image with -o compat=0.10 ==="
> >>+echo
> >>+IMGOPTS="compat=0.10" _make_test_img $IMG_SIZE
> >>+# don't use _img_info, since that function will filter out the
> >>+# additional information we're about to test for
> >>+$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42
> >For curiosity, where's 42 from?
> I want to read all format specific information there, and because
> this is the last information emitted by qemu_img -info, I have to
> grep everything after the line "Format specific information:" until
> EOF – I didn't find an easy way to do this, so I just chose a number
> of lines which seemed enough to fetch all of that format specific
> info (currently, 2 would suffice).
> 
Maybe
    $QEMU_IMG info "$TEST_IMG" | sed -n 'Format specific information:/,$ p'
?

Fam
Max Reitz - Sept. 11, 2013, 7:52 a.m.
On 2013-09-11 09:44, Fam Zheng wrote:
> On Wed, 09/11 09:26, Max Reitz wrote:
>> On 2013-09-11 08:23, Fam Zheng wrote:
>>> On Tue, 09/10 11:33, Max Reitz wrote:
>>>> Add a test for the additional information now provided by qemu-img info
>>>> when used on qcow2 images.
>>>>
>>>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>>>> ---
>>>>   tests/qemu-iotests/064     | 72 ++++++++++++++++++++++++++++++++++++++++++++++
>>>>   tests/qemu-iotests/064.out | 22 ++++++++++++++
>>>>   tests/qemu-iotests/group   |  1 +
>>>>   3 files changed, 95 insertions(+)
>>>>   create mode 100755 tests/qemu-iotests/064
>>>>   create mode 100644 tests/qemu-iotests/064.out
>>>>
>>>> diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064
>>>> new file mode 100755
>>>> index 0000000..4979db5
>>>> --- /dev/null
>>>> +++ b/tests/qemu-iotests/064
>>>> @@ -0,0 +1,72 @@
>>>> +#!/bin/bash
>>>> +#
>>>> +# Test for additional information emitted by qemu-img info on qcow2
>>>> +# images
>>>> +#
>>>> +# 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 <http://www.gnu.org/licenses/>.
>>>> +#
>>>> +
>>>> +# creator
>>>> +owner=mreitz@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
>>>> +
>>>> +# This tests qocw2-specific low-level functionality
>>>> +_supported_fmt qcow2
>>>> +_supported_proto generic
>>>> +_supported_os Linux
>>>> +
>>>> +IMG_SIZE=64M
>>>> +
>>>> +echo
>>>> +echo "=== Testing qcow2 image with -o compat=0.10 ==="
>>>> +echo
>>>> +IMGOPTS="compat=0.10" _make_test_img $IMG_SIZE
>>>> +# don't use _img_info, since that function will filter out the
>>>> +# additional information we're about to test for
>>>> +$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42
>>> For curiosity, where's 42 from?
>> I want to read all format specific information there, and because
>> this is the last information emitted by qemu_img -info, I have to
>> grep everything after the line "Format specific information:" until
>> EOF – I didn't find an easy way to do this, so I just chose a number
>> of lines which seemed enough to fetch all of that format specific
>> info (currently, 2 would suffice).
>>
> Maybe
>      $QEMU_IMG info "$TEST_IMG" | sed -n 'Format specific information:/,$ p'
> ?
>
> Fam
Hm, yes, with a slash up front ('/Format specific information:/,$p') it 
works, I'll use that, then. Thanks.

Max

Patch

diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064
new file mode 100755
index 0000000..4979db5
--- /dev/null
+++ b/tests/qemu-iotests/064
@@ -0,0 +1,72 @@ 
+#!/bin/bash
+#
+# Test for additional information emitted by qemu-img info on qcow2
+# images
+#
+# 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 <http://www.gnu.org/licenses/>.
+#
+
+# creator
+owner=mreitz@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
+
+# This tests qocw2-specific low-level functionality
+_supported_fmt qcow2
+_supported_proto generic
+_supported_os Linux
+
+IMG_SIZE=64M
+
+echo
+echo "=== Testing qcow2 image with -o compat=0.10 ==="
+echo
+IMGOPTS="compat=0.10" _make_test_img $IMG_SIZE
+# don't use _img_info, since that function will filter out the
+# additional information we're about to test for
+$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42
+
+echo
+echo "=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=off ==="
+echo
+IMGOPTS="compat=1.1,lazy_refcounts=off" _make_test_img $IMG_SIZE
+$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42
+
+echo
+echo "=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=on ==="
+echo
+IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img $IMG_SIZE
+$QEMU_IMG info "$TEST_IMG" | grep "Format specific information:" -A 42
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/064.out b/tests/qemu-iotests/064.out
new file mode 100644
index 0000000..6ce5b43
--- /dev/null
+++ b/tests/qemu-iotests/064.out
@@ -0,0 +1,22 @@ 
+QA output created by 064
+
+=== Testing qcow2 image with -o compat=0.10 ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
+Format specific information:
+compat: 0.10
+
+=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=off ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
+Format specific information:
+compat: 1.1
+lazy refcounts: false
+
+=== Testing qcow2 image with -o compat=1.1,lazy_refcounts=on ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
+Format specific information:
+compat: 1.1
+lazy refcounts: true
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index b696242..740cd84 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -66,3 +66,4 @@ 
 059 rw auto
 060 rw auto
 062 rw auto
+064 rw auto