From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJOB0-0002C9-D4 for qemu-devel@nongnu.org; Thu, 05 Feb 2015 10:17:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJOAv-00017j-Dh for qemu-devel@nongnu.org; Thu, 05 Feb 2015 10:17:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJOAv-00017Q-4z for qemu-devel@nongnu.org; Thu, 05 Feb 2015 10:17:01 -0500 Message-ID: <54D38968.6070703@redhat.com> Date: Thu, 05 Feb 2015 10:16:56 -0500 From: Max Reitz MIME-Version: 1.0 References: <1423107872-3268-1-git-send-email-chenxg@linux.vnet.ibm.com> <1423107872-3268-7-git-send-email-chenxg@linux.vnet.ibm.com> In-Reply-To: <1423107872-3268-7-git-send-email-chenxg@linux.vnet.ibm.com> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH RFC v4 6/6] qemu-iotests: s390x: fix test 055 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Xiao Guang Chen , qemu-devel@nongnu.org Cc: kwolf@redhat.com, mimu@linux.vnet.ibm.com, armbru@redhat.com On 2015-02-04 at 22:44, Xiao Guang Chen wrote: > There is no such device 'ide-cd' defined on the s390 platform, so > test_medium_not_found() test is skipped. > > 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..d256d8c 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 == 's390-virtio': > + 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 == 's390-virtio': > + 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 == 's390-virtio': > + return > + > result = self.vm.qmp('transaction', actions=[{ > 'type': cmd, > 'data': { 'device': 'ide1-cd0', As I said in my reply to patch 4, please use spaces instead of tabs. Also, as said in my reply to patch 5, maybe the conditions should be iotests.qemu_default_machine != 'pc' or something similar. But the latter is up to you, so with the tabs replaced by eight spaces each: Reviewed-by: Max Reitz