[Qemu-devel] [PATCH 0/2] iotests: Make tests pass for vpc

[Qemu-devel] [PATCH 0/2] iotests: Make tests pass for vpc

[Max Reitz]

iotest 006 is simply outdated, and the vpc format has certain attributes
that make tests 004 and 104 fail. It's safe to exclude vpc from these
tests, so do that.


Max Reitz (2):
  iotests: Remove 006
  iotests: Drop vpc from 004's and 104's format list

 tests/qemu-iotests/004     |  2 +-
 tests/qemu-iotests/006     | 54 ----------------------------------------------
 tests/qemu-iotests/006.out |  6 ------
 tests/qemu-iotests/104     |  2 +-
 tests/qemu-iotests/group   |  2 +-
 5 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100755 tests/qemu-iotests/006
 delete mode 100644 tests/qemu-iotests/006.out

-- 
2.1.0

[Qemu-devel] [PATCH 1/2] iotests: Remove 006

[Max Reitz]

vpc does support images > 127 GB if done correctly. qemu does it
correctly. Remove the test pretending otherwise.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/006     | 54 ----------------------------------------------
 tests/qemu-iotests/006.out |  6 ------
 tests/qemu-iotests/group   |  2 +-
 3 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100755 tests/qemu-iotests/006
 delete mode 100644 tests/qemu-iotests/006.out

diff --git a/tests/qemu-iotests/006 b/tests/qemu-iotests/006
deleted file mode 100755
index 0c0cf5d..0000000
--- a/tests/qemu-iotests/006
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# Make sure qemu-img rejects > 127GB images for the vpc format as the format
-# doesn't support this.
-#
-# Copyright (C) 2009 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=hch@lst.de
-
-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
-
-_supported_fmt vpc
-_supported_proto generic
-_supported_os Linux
-
-
-echo
-echo "creating 128GB image"
-_make_test_img 128G
-
-# success, all done
-echo "*** done"
-rm -f $seq.full
-status=0
diff --git a/tests/qemu-iotests/006.out b/tests/qemu-iotests/006.out
deleted file mode 100644
index d135841..0000000
--- a/tests/qemu-iotests/006.out
+++ /dev/null
@@ -1,6 +0,0 @@
-QA output created by 006
-
-creating 128GB image
-qemu-img: The image size is too large for file format 'vpc'
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=137438953472
-*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 3ab499a..624d809 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -12,7 +12,7 @@
 003 rw auto
 004 rw auto quick
 005 img auto quick
-006 img auto
+# 006 was removed, do not reuse
 007 snapshot auto
 008 rw auto quick
 009 rw auto quick
-- 
2.1.0

Re: [Qemu-devel] [PATCH 1/2] iotests: Remove 006

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 842 bytes --]

On 03/03/2015 02:22 PM, Max Reitz wrote:
> vpc does support images > 127 GB if done correctly. qemu does it
> correctly. Remove the test pretending otherwise.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/006     | 54 ----------------------------------------------
>  tests/qemu-iotests/006.out |  6 ------
>  tests/qemu-iotests/group   |  2 +-
>  3 files changed, 1 insertion(+), 61 deletions(-)
>  delete mode 100755 tests/qemu-iotests/006
>  delete mode 100644 tests/qemu-iotests/006.out

Should the test be rewritten instead to test that we can create and open
such a file?  But I'm also okay with your decision to nuke it entirely.

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH 1/2] iotests: Remove 006

[Max Reitz]

On 2015-03-03 at 17:05, Eric Blake wrote:
> On 03/03/2015 02:22 PM, Max Reitz wrote:
>> vpc does support images > 127 GB if done correctly. qemu does it
>> correctly. Remove the test pretending otherwise.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>>   tests/qemu-iotests/006     | 54 ----------------------------------------------
>>   tests/qemu-iotests/006.out |  6 ------
>>   tests/qemu-iotests/group   |  2 +-
>>   3 files changed, 1 insertion(+), 61 deletions(-)
>>   delete mode 100755 tests/qemu-iotests/006
>>   delete mode 100644 tests/qemu-iotests/006.out
> Should the test be rewritten instead to test that we can create and open
> such a file?  But I'm also okay with your decision to nuke it entirely.

Well, in order to test it correctly, we'd have to check whether the CHS 
configuration is set to 65535/16/255 (as the specification dictates); 
because that was the purpose of the test, that we cannot exceed that 
limit (whereas in fact we can).

Dropping is easier, so that's what I did.

> Reviewed-by: Eric Blake <eblake@redhat.com>

Thanks!

Max

[Qemu-devel] [PATCH 2/2] iotests: Drop vpc from 004's and 104's format list

[Max Reitz]

Both tests require the test image to have a specific size; this cannot
be guaranteed by vpc (unless tuning the test specifically for that
format).

It is safe to exclude vpc from 004 because what is tested there is
implemented in a generic part in the block layer and not
format-specific.

It is safe to exclude vpc from 104 because for vpc basically every image
size is "unaligned", so if that would break at some point in time, we
would quickly notice just by running the generic tests.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/004 | 2 +-
 tests/qemu-iotests/104 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004
index 651072e..2ad77ed 100755
--- a/tests/qemu-iotests/004
+++ b/tests/qemu-iotests/004
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-_supported_fmt generic
+_supported_fmt raw qcow qcow2 qed vdi vmdk vhdx
 _supported_proto generic
 _supported_os Linux
 
diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104
index f32752b..2e35ea8 100755
--- a/tests/qemu-iotests/104
+++ b/tests/qemu-iotests/104
@@ -34,7 +34,7 @@ trap "exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-_supported_fmt generic
+_supported_fmt raw qcow qcow2 qed vdi vmdk vhdx
 _supported_proto generic
 _supported_os Linux
 
-- 
2.1.0

Re: [Qemu-devel] [PATCH 2/2] iotests: Drop vpc from 004's and 104's format list

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 902 bytes --]

On 03/03/2015 02:22 PM, Max Reitz wrote:
> Both tests require the test image to have a specific size; this cannot
> be guaranteed by vpc (unless tuning the test specifically for that
> format).
> 
> It is safe to exclude vpc from 004 because what is tested there is
> implemented in a generic part in the block layer and not
> format-specific.
> 
> It is safe to exclude vpc from 104 because for vpc basically every image
> size is "unaligned", so if that would break at some point in time, we
> would quickly notice just by running the generic tests.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/004 | 2 +-
>  tests/qemu-iotests/104 | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH 0/2] iotests: Make tests pass for vpc

[Kevin Wolf]

Am 03.03.2015 um 22:22 hat Max Reitz geschrieben:
> iotest 006 is simply outdated, and the vpc format has certain attributes
> that make tests 004 and 104 fail. It's safe to exclude vpc from these
> tests, so do that.

Thanks, applied to the block branch.

Kevin