From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl6XO-0002Pg-Fe for qemu-devel@nongnu.org; Wed, 22 Apr 2015 22:06:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yl6XJ-0007yR-M2 for qemu-devel@nongnu.org; Wed, 22 Apr 2015 22:06:46 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:49929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl6XJ-0007xc-0b for qemu-devel@nongnu.org; Wed, 22 Apr 2015 22:06:41 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 23 Apr 2015 12:06:36 +1000 Received: from d23relay10.au.ibm.com (d23relay10.au.ibm.com [9.190.26.77]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 666B0357804F for ; Thu, 23 Apr 2015 12:06:34 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t3N26QGH49807412 for ; Thu, 23 Apr 2015 12:06:34 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t3N260nc021128 for ; Thu, 23 Apr 2015 12:06:01 +1000 From: Bo Tu Date: Thu, 23 Apr 2015 10:05:24 +0800 Message-Id: <1429754727-11263-5-git-send-email-tubo@linux.vnet.ibm.com> In-Reply-To: <1429754727-11263-1-git-send-email-tubo@linux.vnet.ibm.com> References: <1429754727-11263-1-git-send-email-tubo@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH RFC v7 4/7] qemu-iotests: s390x: fix test 055 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, armbru@redhat.com, mimu@linux.vnet.ibm.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