Re: [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts

[Max Reitz]

On 29.09.19 18:31, Maxim Levitsky wrote:
> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>> Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
>> globally.  That is not how it should be done; instead, they should
>> simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
>> default anyway).
>>
>> This makes the tests heed user-specified $IMGOPTS.  Some do not work
>> with all image options, though, so we need to disable them accordingly.
>>
>> Signed-off-by: Max Reitz <address@hidden>
>> ---
>>  tests/qemu-iotests/036 | 3 +--
>>  tests/qemu-iotests/060 | 4 ++--
>>  tests/qemu-iotests/062 | 3 ++-
>>  tests/qemu-iotests/066 | 3 ++-
>>  tests/qemu-iotests/068 | 3 ++-
>>  tests/qemu-iotests/098 | 3 +--
>>  6 files changed, 10 insertions(+), 9 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
>> index 69d0f9f903..57dda23b02 100755
>> --- a/tests/qemu-iotests/036
>> +++ b/tests/qemu-iotests/036
>> @@ -43,9 +43,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>>  # This tests qcow2-specific low-level functionality
>>  _supported_fmt qcow2
>>  _supported_proto file
>> -
>>  # Only qcow2v3 and later supports feature bits
>> -IMGOPTS="compat=1.1"
>> +_unsupported_imgopts 'compat=0.10'
>>  
>>  echo
>>  echo === Image with unknown incompatible feature bit ===
>> diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
>> index b91d8321bb..9c2ef42522 100755
>> --- a/tests/qemu-iotests/060
>> +++ b/tests/qemu-iotests/060
>> @@ -48,6 +48,8 @@ _filter_io_error()
>>  _supported_fmt qcow2
>>  _supported_proto file
>>  _supported_os Linux
>> +# These tests only work for compat=1.1 images with refcount_bits=16
>> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
>>  
>>  rt_offset=65536  # 0x10000 (XXX: just an assumption)
>>  rb_offset=131072 # 0x20000 (XXX: just an assumption)
>> @@ -55,8 +57,6 @@ l1_offset=196608 # 0x30000 (XXX: just an assumption)
>>  l2_offset=262144 # 0x40000 (XXX: just an assumption)
>>  l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption)
>>  
>> -IMGOPTS="compat=1.1"
>> -
>>  OPEN_RW="open -o overlap-check=all $TEST_IMG"
>>  # Overlap checks are done before write operations only, therefore opening an
>>  # image read-only makes the overlap-check option irrelevant
>> diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
>> index d5f818fcce..ac0d2a9a3b 100755
>> --- a/tests/qemu-iotests/062
>> +++ b/tests/qemu-iotests/062
>> @@ -40,8 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>>  # This tests qocw2-specific low-level functionality
>>  _supported_fmt qcow2
>>  _supported_proto generic
>> +# We need zero clusters and snapshots
>> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>>  
>> -IMGOPTS="compat=1.1"
>>  IMG_SIZE=64M
>>  
>>  echo
>> diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
>> index 28f8c98412..9a15ba8027 100755
>> --- a/tests/qemu-iotests/066
>> +++ b/tests/qemu-iotests/066
>> @@ -39,9 +39,10 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>>  # This tests qocw2-specific low-level functionality
>>  _supported_fmt qcow2
>>  _supported_proto generic
>> +# Weneed zero clusters and snapshots
> Typo

Indeed!

>> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>>  
>>  # Intentionally create an unaligned image
>> -IMGOPTS="compat=1.1"
>>  IMG_SIZE=$((64 * 1024 * 1024 + 512))
>>  
>>  echo
>> diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
>> index 22f5ca3ba6..65650fca9a 100755
>> --- a/tests/qemu-iotests/068
>> +++ b/tests/qemu-iotests/068
>> @@ -39,8 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>>  # This tests qocw2-specific low-level functionality
>>  _supported_fmt qcow2
>>  _supported_proto generic
>> +# Internal snapshots are (currently) impossible with refcount_bits=1
> Why currently? 1 bit will only allow to mark a cluser as used/unused which
> is not enough for any snapshots?

It is, because in theory you can just copy the clusters at the time of
snapshotting.  We’ll never implement it, but, well...

>> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>>  
>> -IMGOPTS="compat=1.1"
>>  IMG_SIZE=128K
>>  
>>  case "$QEMU_DEFAULT_MACHINE" in
>> diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
>> index 1c1d1c468f..2d68dc7d6c 100755
>> --- a/tests/qemu-iotests/098
>> +++ b/tests/qemu-iotests/098
>> @@ -40,8 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>>  
>>  _supported_fmt qcow2
>>  _supported_proto file
>> -
>> -IMGOPTS="compat=1.1"
>> +_unsupported_imgopts 'compat=0.10'
> Any idea why? I am not familiar with qcow2 well enought to
> know but this misses a comment with justification.

Because the special bdrv_make_empty() version we want to test only works
with qcow2 v3 images.

>>  
>>  for event in l1_update empty_image_prepare reftable_update refblock_alloc; 
>> do
>>  
> 
> 
> Best regards,
>       Maxim Levitsky
> 

Thanks for reviewing!

Max

signature.asc
Description: OpenPGP digital signature