From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ywj6i-00044k-6Z for qemu-devel@nongnu.org; Sun, 24 May 2015 23:31:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ywj6d-0004o4-VV for qemu-devel@nongnu.org; Sun, 24 May 2015 23:31:16 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:42272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ywj6d-0004nJ-B0 for qemu-devel@nongnu.org; Sun, 24 May 2015 23:31:11 -0400 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 25 May 2015 09:01:08 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 10117125804B for ; Mon, 25 May 2015 09:03:26 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t4P3V6Gl7209290 for ; Mon, 25 May 2015 09:01:06 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t4P2k4wf005596 for ; Mon, 25 May 2015 08:16:04 +0530 From: Bo Tu Date: Mon, 25 May 2015 11:30:54 +0800 Message-Id: <1432524657-3113-5-git-send-email-tubo@linux.vnet.ibm.com> In-Reply-To: <1432524657-3113-1-git-send-email-tubo@linux.vnet.ibm.com> References: <1432524657-3113-1-git-send-email-tubo@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH RFC v9 4/7] qemu-iotests: s390x: fix test 055 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com Cc: mreitz@redhat.com, mimu@linux.vnet.ibm.com, qemu-devel@nongnu.org, armbru@redhat.com From: Xiao Guang Chen There is no 'ide-cd' device defined on s390 platform, so test_medium_not_found() test should be skipped. Reviewed-by: Max Reitz Reviewed-by: Michael Mueller Signed-off-by: Xiao Guang Chen --- tests/qemu-iotests/055 | 9 +++++++++ 1 file changed, 9 insertions(+) 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', -- 2.3.0