From patchwork Wed Feb 11 10:37:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guang Chen X-Patchwork-Id: 438741 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 67C5514012C for ; Wed, 11 Feb 2015 21:39:55 +1100 (AEDT) Received: from localhost ([::1]:44045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLUi1-0007DP-Kw for incoming@patchwork.ozlabs.org; Wed, 11 Feb 2015 05:39:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLUgI-0003uc-7k for qemu-devel@nongnu.org; Wed, 11 Feb 2015 05:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLUg8-0003Q3-VR for qemu-devel@nongnu.org; Wed, 11 Feb 2015 05:38:06 -0500 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:40964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLUg8-0003PD-AZ for qemu-devel@nongnu.org; Wed, 11 Feb 2015 05:37:56 -0500 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 11 Feb 2015 16:07:53 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp07.in.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 11 Feb 2015 16:07:51 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 90FF3394004E for ; Wed, 11 Feb 2015 16:07:50 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay03.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1BAboh44849936 for ; Wed, 11 Feb 2015 16:07:50 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t1BAboBi020863 for ; Wed, 11 Feb 2015 16:07:50 +0530 Received: from chenxg-ThinkPad-T440p.ibm.com ([9.77.176.95]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t1BAbgWT020337; Wed, 11 Feb 2015 16:07:48 +0530 From: Xiao Guang Chen To: qemu-devel@nongnu.org Date: Wed, 11 Feb 2015 18:37:36 +0800 Message-Id: <1423651057-16204-5-git-send-email-chenxg@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423651057-16204-1-git-send-email-chenxg@linux.vnet.ibm.com> References: <1423651057-16204-1-git-send-email-chenxg@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15021110-0025-0000-0000-0000035501C1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 122.248.162.7 Cc: kwolf@redhat.com, armbru@redhat.com, mimu@linux.vnet.ibm.com, mreitz@redhat.com Subject: [Qemu-devel] [PATCH RFC v6 4/5] qemu-iotests: s390x: fix test 055 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 e81d4d0..0f80bc1 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') @@ -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 != 'pc': + return + result = self.vm.qmp('transaction', actions=[{ 'type': cmd, 'data': { 'device': 'ide1-cd0',