iotests: Remove the superfluous 2nd check for the availability of quorum

[PATCH] iotests: Remove the superfluous 2nd check for the availability of quorum

Posted by Thomas Huth 5 years, 9 months ago

Commit d9df28e7b07 ("iotests: check whitelisted formats") added the
modern @iotests.skip_if_unsupported() to the functions in this test,
so we don't need the old explicit test here anymore.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/139 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
index cbb5a76530..2f075888ba 100755
--- a/tests/qemu-iotests/139
+++ b/tests/qemu-iotests/139
@@ -344,9 +344,6 @@ class TestBlockdevDel(iotests.QMPTestCase):
 
     @iotests.skip_if_unsupported(['quorum'])
     def testQuorum(self):
-        if not iotests.supports_quorum():
-            return
-
         self.addQuorum('quorum0', 'node0', 'node1')
         # We cannot remove the children of a Quorum device
         self.delBlockDriverState('node0', expect_error = True)
-- 
2.18.1

Re: [PATCH] iotests: Remove the superfluous 2nd check for the availability of quorum

Posted by Andrey Shinkevich 5 years, 9 months ago

On 29/01/2020 17:17, Thomas Huth wrote:
> Commit d9df28e7b07 ("iotests: check whitelisted formats") added the
> modern @iotests.skip_if_unsupported() to the functions in this test,
> so we don't need the old explicit test here anymore.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/qemu-iotests/139 | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
> index cbb5a76530..2f075888ba 100755
> --- a/tests/qemu-iotests/139
> +++ b/tests/qemu-iotests/139
> @@ -344,9 +344,6 @@ class TestBlockdevDel(iotests.QMPTestCase):
>   
>       @iotests.skip_if_unsupported(['quorum'])
>       def testQuorum(self):
> -        if not iotests.supports_quorum():
> -            return
> -
>           self.addQuorum('quorum0', 'node0', 'node1')
>           # We cannot remove the children of a Quorum device
>           self.delBlockDriverState('node0', expect_error = True)
> 

Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Tested-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
-- 
With the best regards,
Andrey Shinkevich

Re: [PATCH] iotests: Remove the superfluous 2nd check for the availability of quorum

Posted by Max Reitz 5 years, 9 months ago

On 29.01.20 15:17, Thomas Huth wrote:
> Commit d9df28e7b07 ("iotests: check whitelisted formats") added the
> modern @iotests.skip_if_unsupported() to the functions in this test,
> so we don't need the old explicit test here anymore.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qemu-iotests/139 | 3 ---
>  1 file changed, 3 deletions(-)

Thanks, applied to my block branch:

https://git.xanclic.moe/XanClic/qemu/commits/branch/block

Max

Re: [PATCH] iotests: Remove the superfluous 2nd check for the availability of quorum

Posted by Alberto Garcia 5 years, 9 months ago

On Wed 29 Jan 2020 03:17:51 PM CET, Thomas Huth wrote:
> Commit d9df28e7b07 ("iotests: check whitelisted formats") added the
> modern @iotests.skip_if_unsupported() to the functions in this test,
> so we don't need the old explicit test here anymore.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Alberto Garcia <berto@igalia.com>

Berto