On 2015-02-04 at 22:44, Xiao Guang Chen wrote:
There is no such device 'ide-cd' defined on the s390 platform, so test_medium_not_found() test is skipped.Reviewed-by: Michael Mueller <m...@linux.vnet.ibm.com> Signed-off-by: Xiao Guang Chen <che...@linux.vnet.ibm.com> --- tests/qemu-iotests/055 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055 index e81d4d0..d256d8c 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 == 's390-virtio': + 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 == 's390-virtio': + return + result = self.vm.qmp('blockdev-backup', device='ide1-cd0', target='drive1', sync='full') self.assert_qmp(result, 'error/class', 'GenericError') @@ -320,6 +326,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 == 's390-virtio': + return + result = self.vm.qmp('transaction', actions=[{ 'type': cmd, 'data': { 'device': 'ide1-cd0',
As I said in my reply to patch 4, please use spaces instead of tabs. Also, as said in my reply to patch 5, maybe the conditions should be iotests.qemu_default_machine != 'pc' or something similar.
But the latter is up to you, so with the tabs replaced by eight spaces each: Reviewed-by: Max Reitz <mre...@redhat.com>
