From patchwork Wed Feb 11 10:37:35 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: 438739 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 1034114012C for ; Wed, 11 Feb 2015 21:38:39 +1100 (AEDT) Received: from localhost ([::1]:44027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLUgn-0004lv-9a for incoming@patchwork.ozlabs.org; Wed, 11 Feb 2015 05:38:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLUgI-0003ud-LM for qemu-devel@nongnu.org; Wed, 11 Feb 2015 05:38:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLUg7-0003Pc-IA for qemu-devel@nongnu.org; Wed, 11 Feb 2015 05:38:06 -0500 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:49330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLUg6-0003Oz-V0 for qemu-devel@nongnu.org; Wed, 11 Feb 2015 05:37:55 -0500 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 11 Feb 2015 16:07:52 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 11 Feb 2015 16:07:49 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 7FBB4E005A for ; Wed, 11 Feb 2015 16:09:23 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay04.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1BAbmY259572332 for ; Wed, 11 Feb 2015 16:07:49 +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 t1BAbm5u020763 for ; Wed, 11 Feb 2015 16:07:48 +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 t1BAbgWS020337; Wed, 11 Feb 2015 16:07:47 +0530 From: Xiao Guang Chen To: qemu-devel@nongnu.org Date: Wed, 11 Feb 2015 18:37:35 +0800 Message-Id: <1423651057-16204-4-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-0033-0000-0000-0000044A6E06 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 122.248.162.9 Cc: kwolf@redhat.com, armbru@redhat.com, mimu@linux.vnet.ibm.com, mreitz@redhat.com Subject: [Qemu-devel] [PATCH RFC v6 3/5] qemu-iotests: s390x: fix test 041 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/041 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index 59a8f73..c6abe3c 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -197,6 +197,9 @@ class TestSingleDrive(ImageMirroringTestCase): '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') @@ -867,6 +870,9 @@ class TestRepairQuorum(ImageMirroringTestCase): 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',