[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 03/16] qemu-iotests: s390x: fix test 041 and 055
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 03/16] qemu-iotests: s390x: fix test 041 and 055 |
Date: |
Fri, 4 Sep 2015 22:10:34 +0200 |
From: Bo Tu <address@hidden>
There is no 'ide-cd' device defined on non-pc platform, so
test_medium_not_found() test should be skipped.
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Michael Mueller <address@hidden>
Reviewed-by: Sascha Silbe <address@hidden>
Signed-off-by: Xiao Guang Chen <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/041 | 6 ++++++
tests/qemu-iotests/055 | 9 +++++++++
2 files changed, 15 insertions(+)
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 3d46ed7..de8ea15 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -167,6 +167,9 @@ class TestSingleDrive(iotests.QMPTestCase):
'target image does not match source after mirroring')
def test_medium_not_found(self):
+ if iotests.qemu_default_machine != 'pc':
+ return
+
result = self.vm.qmp('drive-mirror', device='ide1-cd0', sync='full',
target=target_img)
self.assert_qmp(result, 'error/class', 'GenericError')
@@ -831,6 +834,9 @@ class TestRepairQuorum(iotests.QMPTestCase):
if not self.has_quorum():
return
+ if iotests.qemu_default_machine != 'pc':
+ return
+
result = self.vm.qmp('drive-mirror', device='ide1-cd0', sync='full',
node_name='repair0',
replaces='img1',
diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055
index 017a609..e6e0ac4 100755
--- a/tests/qemu-iotests/055
+++ b/tests/qemu-iotests/055
@@ -104,11 +104,17 @@ class TestSingleDrive(iotests.QMPTestCase):
self.do_test_pause('blockdev-backup', 'drive1', blockdev_target_img)
def test_medium_not_found(self):
+ if iotests.qemu_default_machine != 'pc':
+ return
+
result = self.vm.qmp('drive-backup', device='ide1-cd0',
target=target_img, sync='full')
self.assert_qmp(result, 'error/class', 'GenericError')
def test_medium_not_found_blockdev_backup(self):
+ if iotests.qemu_default_machine != 'pc':
+ return
+
result = self.vm.qmp('blockdev-backup', device='ide1-cd0',
target='drive1', sync='full')
self.assert_qmp(result, 'error/class', 'GenericError')
@@ -323,6 +329,9 @@ class TestSingleTransaction(iotests.QMPTestCase):
self.do_test_pause('blockdev-backup', 'drive1', blockdev_target_img)
def do_test_medium_not_found(self, cmd, target):
+ if iotests.qemu_default_machine != 'pc':
+ return
+
result = self.vm.qmp('transaction', actions=[{
'type': cmd,
'data': { 'device': 'ide1-cd0',
--
1.8.3.1
- [Qemu-block] [PULL 00/16] Block patches, Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 01/16] qemu-iotests: qemu machine type support, Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 03/16] qemu-iotests: s390x: fix test 041 and 055,
Kevin Wolf <=
- [Qemu-block] [PULL 02/16] qemu-iotests: disable default qemu devices for cross-platform compatibility, Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 04/16] qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts, Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 05/16] qemu-iotests: s390x: fix test 130, Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 06/16] block/raw-posix: Use raw_normalize_devicepath(), Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 08/16] iotests: More options for VM.add_drive(), Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 07/16] qemu-img: Fix crash in amend invocation, Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 09/16] iotests: Respect -nodefaults in tests 41 and 55, Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 11/16] iotests: Warn if python subprocess is killed, Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 10/16] iotests: Do not suppress segfaults in bash tests, Kevin Wolf, 2015/09/04
- [Qemu-block] [PULL 12/16] qcow2: mark the memory as no longer needed after qcow2_cache_empty(), Kevin Wolf, 2015/09/04