[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/13] qemu-iotests: 148: properly skip test if quoru
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 11/13] qemu-iotests: 148: properly skip test if quorum support is missing |
Date: |
Tue, 12 Apr 2016 18:19:06 +0200 |
From: Sascha Silbe <address@hidden>
qemu-iotests test case 148 already had some code for skipping the test
if quorum support is missing, but it didn't work in all
cases. TestQuorumEvents.setUp() gets run before the actual test class
(which contains the skipping code) and tries to start qemu with a drive
using the quorum driver. For some reason this works fine when using
qcow2, but fails for raw.
As the entire test case requires quorum, just check for availability
before even starting the test suite. Introduce a verify_quorum()
function in iotests.py for this purpose so future test cases can make
use of it.
Signed-off-by: Sascha Silbe <address@hidden>
Reviewed-by: Bo Tu <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/148 | 4 +---
tests/qemu-iotests/iotests.py | 5 +++++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/148 b/tests/qemu-iotests/148
index d066ec3..e01b061 100644
--- a/tests/qemu-iotests/148
+++ b/tests/qemu-iotests/148
@@ -79,9 +79,6 @@ sector = "%d"
self.assert_qmp(event, 'data/sector-num', sector)
def testQuorum(self):
- if not 'quorum' in iotests.qemu_img_pipe('--help'):
- return
-
# Generate an error and get an event
self.vm.hmp_qemu_io("drive0", "aio_read %d %d" %
(offset * sector_size, sector_size))
@@ -139,4 +136,5 @@ class TestFifoQuorumEvents(TestQuorumEvents):
read_pattern = 'fifo'
if __name__ == '__main__':
+ iotests.verify_quorum()
iotests.main(supported_fmts=["raw"])
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index fb5c482..bf31ec8 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -437,6 +437,11 @@ def verify_platform(supported_oses=['linux']):
if True not in [sys.platform.startswith(x) for x in supported_oses]:
notrun('not suitable for this OS: %s' % sys.platform)
+def verify_quorum():
+ '''Skip test suite if quorum support is not available'''
+ if 'quorum' not in qemu_img_pipe('--help'):
+ notrun('quorum support missing')
+
def main(supported_fmts=[], supported_oses=['linux']):
'''Run tests'''
--
1.8.3.1
- [Qemu-devel] [PULL 05/13] vpc: fix return value check for blk_pwrite, (continued)
- [Qemu-devel] [PULL 05/13] vpc: fix return value check for blk_pwrite, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 04/13] iotests: Make 150 use qemu-img map instead of du, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 07/13] MAINTAINERS: Block layer core, qcow2 and blkdebug, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 08/13] qemu-iotests: check: don't place files with predictable names in /tmp, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 06/13] qcow2: Prevent backing file names longer than 1023, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 01/13] iotests: fix the broken 026.nocache output, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 10/13] qemu-iotests: iotests.VM: remove qtest socket on error, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 13/13] qemu-iotests: iotests.py: get rid of __all__, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 12/13] qemu-iotests: 068: don't require KVM, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 09/13] qemu-iotests: fix 051 on non-PC architectures, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 11/13] qemu-iotests: 148: properly skip test if quorum support is missing,
Kevin Wolf <=
- Re: [Qemu-devel] [PULL 00/13] Block patches for 2.6, Peter Maydell, 2016/04/13