From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ywj6h-00044j-PI for qemu-devel@nongnu.org; Sun, 24 May 2015 23:31:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ywj6d-0004nh-8E for qemu-devel@nongnu.org; Sun, 24 May 2015 23:31:15 -0400 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:32923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ywj6c-0004n8-Kk for qemu-devel@nongnu.org; Sun, 24 May 2015 23:31:11 -0400 Received: from /spool/local by e28smtp05.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 d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 6361C3940049 for ; Mon, 25 May 2015 09:01:05 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t4P3V58F9371994 for ; Mon, 25 May 2015 09:01:05 +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 t4P2k3R8005542 for ; Mon, 25 May 2015 08:16:03 +0530 From: Bo Tu Date: Mon, 25 May 2015 11:30:53 +0800 Message-Id: <1432524657-3113-4-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 3/7] qemu-iotests: s390x: fix test 041 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/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', -- 2.3.0