Re: [Qemu-devel] [PATCH] iotests: Check for quorum support in test 139

[Max Reitz]

On 10.11.2015 17:28, Alberto Garcia wrote:
> The quorum driver is always built in, but it is disabled during
> run-time if there's no SHA256 support available (see commit e94867e).
> 
> This patch skips the quorum test in iotest 139 in that case.
> 
> Signed-off-by: Alberto Garcia 
> ---
>  tests/qemu-iotests/139 | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
> index b5470f7..42f78c7 100644
> --- a/tests/qemu-iotests/139
> +++ b/tests/qemu-iotests/139
> @@ -400,6 +400,8 @@ class TestBlockdevDel(iotests.QMPTestCase):
>  self.checkBlockDriverState('node1', False)
>  
>  def testQuorum(self):
> +if not 'quorum' in iotests.qemu_img_pipe('--help'):
> +return
>  self.addQuorum('quorum0', 'node0', 'node1')
>  # We cannot remove the children of a Quorum device
>  self.delBlockDriverState('node0', expect_error = True)

Thanks, applied to my block tree:

https://github.com/XanClic/qemu/commits/block


Max



signature.asc
Description: OpenPGP digital signature

[Qemu-devel] [PATCH] iotests: Check for quorum support in test 139

[Alberto Garcia]

The quorum driver is always built in, but it is disabled during
run-time if there's no SHA256 support available (see commit e94867e).

This patch skips the quorum test in iotest 139 in that case.

Signed-off-by: Alberto Garcia 
---
 tests/qemu-iotests/139 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
index b5470f7..42f78c7 100644
--- a/tests/qemu-iotests/139
+++ b/tests/qemu-iotests/139
@@ -400,6 +400,8 @@ class TestBlockdevDel(iotests.QMPTestCase):
 self.checkBlockDriverState('node1', False)
 
 def testQuorum(self):
+if not 'quorum' in iotests.qemu_img_pipe('--help'):
+return
 self.addQuorum('quorum0', 'node0', 'node1')
 # We cannot remove the children of a Quorum device
 self.delBlockDriverState('node0', expect_error = True)
-- 
2.6.2