Re: [PATCH v4 19/19] iotests: specify some unsupported_imgopts for python iotests

[Hanna Reitz <hreitz@redhat.com>]

On 03.12.21 14:07, Vladimir Sementsov-Ogievskiy wrote:
> We support IMGOPTS for python iotests now. Still a lot of tests are
> unprepared to common IMGOPTS that are used with bash iotests. So we
> should define corresponding unsupported_imgopts.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>   tests/qemu-iotests/044                                 | 3 ++-
>   tests/qemu-iotests/065                                 | 3 ++-
>   tests/qemu-iotests/163                                 | 3 ++-
>   tests/qemu-iotests/165                                 | 3 ++-
>   tests/qemu-iotests/196                                 | 3 ++-
>   tests/qemu-iotests/242                                 | 3 ++-
>   tests/qemu-iotests/246                                 | 3 ++-
>   tests/qemu-iotests/254                                 | 3 ++-
>   tests/qemu-iotests/260                                 | 4 ++--
>   tests/qemu-iotests/274                                 | 3 ++-
>   tests/qemu-iotests/281                                 | 3 ++-
>   tests/qemu-iotests/303                                 | 3 ++-
>   tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test | 3 ++-
>   tests/qemu-iotests/tests/migrate-bitmaps-test          | 3 ++-
>   tests/qemu-iotests/tests/migrate-during-backup         | 3 ++-
>   tests/qemu-iotests/tests/remove-bitmap-from-backing    | 3 ++-
>   16 files changed, 32 insertions(+), 17 deletions(-)

Few of these tests look like they could be made to support refcount_bits 
if we filtered qemu-img info output accordingly, but I don’t mind just 
marking the option as unsupported, so I’m good with your approach.

> diff --git a/tests/qemu-iotests/044 b/tests/qemu-iotests/044
> index 714329eb16..a5ee9a7ded 100755
> --- a/tests/qemu-iotests/044
> +++ b/tests/qemu-iotests/044
> @@ -118,4 +118,5 @@ class TestRefcountTableGrowth(iotests.QMPTestCase):
>   if __name__ == '__main__':
>       iotests.activate_logging()
>       iotests.main(supported_fmts=['qcow2'],
> -                 supported_protocols=['file'])
> +                 supported_protocols=['file'],
> +                 unsupported_imgopts=['refcount_bits'])
> diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065
> index 4b3c5c6c8c..f7c1b68dad 100755
> --- a/tests/qemu-iotests/065
> +++ b/tests/qemu-iotests/065
> @@ -139,4 +139,5 @@ TestQMP = None
>   
>   if __name__ == '__main__':
>       iotests.main(supported_fmts=['qcow2'],
> -                 supported_protocols=['file'])
> +                 supported_protocols=['file'],
> +                 unsupported_imgopts=['refcount_bits'])
> diff --git a/tests/qemu-iotests/163 b/tests/qemu-iotests/163
> index dedce8ef43..0b00df519c 100755
> --- a/tests/qemu-iotests/163
> +++ b/tests/qemu-iotests/163
> @@ -169,4 +169,5 @@ ShrinkBaseClass = None
>   
>   if __name__ == '__main__':
>       iotests.main(supported_fmts=['raw', 'qcow2'],
> -                 supported_protocols=['file'])
> +                 supported_protocols=['file'],
> +                 unsupported_imgopts=['compat=0.10'])

Works for my case (I use -o compat=0.10), but compat=v2 is also allowed.

For cases that don’t support anything but refcount_bits=16, you already 
disallow specifying any refcount_bits value, even refcount_bits=16 
(which would work fine in most cases, I believe). Perhaps we should then 
also just disallow any compat option instead of compat=0.10 specifically?

[...]

> diff --git a/tests/qemu-iotests/tests/migrate-during-backup b/tests/qemu-iotests/tests/migrate-during-backup
> index 34103229ee..12cc4dde2e 100755
> --- a/tests/qemu-iotests/tests/migrate-during-backup
> +++ b/tests/qemu-iotests/tests/migrate-during-backup
> @@ -94,4 +94,5 @@ class TestMigrateDuringBackup(iotests.QMPTestCase):
>   
>   if __name__ == '__main__':
>       iotests.main(supported_fmts=['qcow2'],
> -                 supported_protocols=['file'])
> +                 supported_protocols=['file'],
> +                 unsupported_imgopts=['compat=0.10'])

It seems to me like this test can handle compat=0.10 just fine, though.

Hanna