From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAvQ3-0002U2-8Y for qemu-devel@nongnu.org; Fri, 03 Jul 2015 03:29:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAvQ0-0001my-1d for qemu-devel@nongnu.org; Fri, 03 Jul 2015 03:29:55 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:45181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAvPz-0001lb-EA for qemu-devel@nongnu.org; Fri, 03 Jul 2015 03:29:51 -0400 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 3 Jul 2015 12:59:47 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 3D07BE0085 for ; Fri, 3 Jul 2015 13:03:16 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay02.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t637TT3h2687240 for ; Fri, 3 Jul 2015 12:59:30 +0530 Received: from d28av05.in.ibm.com (localhost [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t637TTCi024650 for ; Fri, 3 Jul 2015 12:59:29 +0530 From: Bo Tu Date: Fri, 3 Jul 2015 15:28:48 +0800 Message-Id: <1435908530-25980-4-git-send-email-tubo@linux.vnet.ibm.com> In-Reply-To: <1435908530-25980-1-git-send-email-tubo@linux.vnet.ibm.com> References: <1435908530-25980-1-git-send-email-tubo@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v11 3/5] qemu-iotests: s390x: fix test 041 and 055 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com Cc: silbe@linux.vnet.ibm.com, mreitz@redhat.com, mimu@linux.vnet.ibm.com, qemu-devel@nongnu.org, armbru@redhat.com There is no 'ide-cd' device defined on non-pc platform, so test_medium_not_found() test should be skipped. Reviewed-by: Max Reitz Reviewed-by: Michael Mueller Reviewed-by: Sascha Silbe Signed-off-by: Xiao Guang Chen --- tests/qemu-iotests/041 | 6 ++++++ tests/qemu-iotests/055 | 9 +++++++++ 2 files changed, 15 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', 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