[Qemu-devel] [PATCH 3/3] iotests: check whitelisted formats

Andrey Shinkevich posted 3 patches 6 years, 8 months ago
Maintainers: Kevin Wolf <kwolf@redhat.com>, Markus Armbruster <armbru@redhat.com>, Max Reitz <mreitz@redhat.com>
There is a newer version of this series
[Qemu-devel] [PATCH 3/3] iotests: check whitelisted formats
Posted by Andrey Shinkevich 6 years, 8 months ago
Some test cases require specific formats. The method decorator
skip_if_unsupported() checks if requested formats are whitelisted.
The test #139 was selected for a sample output:

137 3s ...
138 0s ...
139 2s ...
    [case not run] testBlkVerify (__main__.TestBlockdevDel): formats ['blkverify'] are not whitelisted
    [case not run] testQuorum (__main__.TestBlockdevDel): formats ['quorum'] are not whitelisted
140 0s ...
Not run: 131 135 136
Some cases not run in: 139
Passed all 137 tests

Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
---
 tests/qemu-iotests/139 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
index 62402c1..cb97029 100755
--- a/tests/qemu-iotests/139
+++ b/tests/qemu-iotests/139
@@ -333,6 +333,7 @@ class TestBlockdevDel(iotests.QMPTestCase):
         self.delBlockDriverState('debug0')
         self.checkBlockDriverState('node0', False)
 
+    @iotests.skip_if_unsupported(['blkverify'])
     def testBlkVerify(self):
         self.addBlkVerify('verify0', 'node0', 'node1')
         # We cannot remove the children of a blkverify device
@@ -343,6 +344,7 @@ class TestBlockdevDel(iotests.QMPTestCase):
         self.checkBlockDriverState('node0', False)
         self.checkBlockDriverState('node1', False)
 
+    @iotests.skip_if_unsupported(['quorum'])
     def testQuorum(self):
         if not iotests.supports_quorum():
             return
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH 3/3] iotests: check whitelisted formats
Posted by Kevin Wolf 6 years, 8 months ago
Am 04.03.2019 um 11:08 hat Andrey Shinkevich geschrieben:
> Some test cases require specific formats. The method decorator
> skip_if_unsupported() checks if requested formats are whitelisted.
> The test #139 was selected for a sample output:
> 
> 137 3s ...
> 138 0s ...
> 139 2s ...
>     [case not run] testBlkVerify (__main__.TestBlockdevDel): formats ['blkverify'] are not whitelisted
>     [case not run] testQuorum (__main__.TestBlockdevDel): formats ['quorum'] are not whitelisted
> 140 0s ...
> Not run: 131 135 136
> Some cases not run in: 139
> Passed all 137 tests
> 
> Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

Would you mind squashing in this hunk for v3?

Kevin

diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
index cb970294d3..933b45121a 100755
--- a/tests/qemu-iotests/139
+++ b/tests/qemu-iotests/139
@@ -325,6 +325,7 @@ class TestBlockdevDel(iotests.QMPTestCase):
         # FIXME mirror0 disappears, drive-mirror doesn't take a reference
         #self.delBlockDriverState('mirror0')
 
+    @iotests.skip_if_unsupported(['blkdebug'])
     def testBlkDebug(self):
         self.addBlkDebug('debug0', 'node0')
         # 'node0' is used by the blkdebug node

Re: [Qemu-devel] [PATCH 3/3] iotests: check whitelisted formats
Posted by Andrey Shinkevich 6 years, 8 months ago

On 06/03/2019 17:52, Kevin Wolf wrote:
> Am 04.03.2019 um 11:08 hat Andrey Shinkevich geschrieben:
>> Some test cases require specific formats. The method decorator
>> skip_if_unsupported() checks if requested formats are whitelisted.
>> The test #139 was selected for a sample output:
>>
>> 137 3s ...
>> 138 0s ...
>> 139 2s ...
>>      [case not run] testBlkVerify (__main__.TestBlockdevDel): formats ['blkverify'] are not whitelisted
>>      [case not run] testQuorum (__main__.TestBlockdevDel): formats ['quorum'] are not whitelisted
>> 140 0s ...
>> Not run: 131 135 136
>> Some cases not run in: 139
>> Passed all 137 tests
>>
>> Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
> 
> Would you mind squashing in this hunk for v3?
> 
> Kevin
> 

I will squash it in v3.

Andrey

> diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
> index cb970294d3..933b45121a 100755
> --- a/tests/qemu-iotests/139
> +++ b/tests/qemu-iotests/139
> @@ -325,6 +325,7 @@ class TestBlockdevDel(iotests.QMPTestCase):
>           # FIXME mirror0 disappears, drive-mirror doesn't take a reference
>           #self.delBlockDriverState('mirror0')
>   
> +    @iotests.skip_if_unsupported(['blkdebug'])
>       def testBlkDebug(self):
>           self.addBlkDebug('debug0', 'node0')
>           # 'node0' is used by the blkdebug node
>