diff options
| author | Bo Tu <tubo@linux.vnet.ibm.com> | 2015-07-03 15:28:48 +0800 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-09-04 20:59:48 +0200 |
| commit | d8683155fa76cabff112271771e43e21034ff2ba (patch) | |
| tree | 885aae24e1a0a16485c3464e679d224131aa5a59 | |
| parent | 2711fd33a4b18c5e35a6f7efe57b5d868def829e (diff) | |
| download | qemu-d8683155fa76cabff112271771e43e21034ff2ba.zip qemu-d8683155fa76cabff112271771e43e21034ff2ba.tar.gz qemu-d8683155fa76cabff112271771e43e21034ff2ba.tar.bz2 | |
qemu-iotests: s390x: fix test 041 and 055
There is no 'ide-cd' device defined on non-pc platform, so
test_medium_not_found() test should be skipped.
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Signed-off-by: Xiao Guang Chen <chenxg@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rwxr-xr-x | tests/qemu-iotests/041 | 6 | ||||
| -rwxr-xr-x | tests/qemu-iotests/055 | 9 |
2 files changed, 15 insertions, 0 deletions
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', |