diff mbox

[RFC,v4,4/6] qemu-iotests: s390x: fix test 041

Message ID 1423107872-3268-5-git-send-email-chenxg@linux.vnet.ibm.com
State New
Headers show

Commit Message

Xiao Guang Chen Feb. 5, 2015, 3:44 a.m. UTC 
From: Mao Chuan Li <maochuan@linux.vnet.ibm.com>

There is no such device 'ide-cd' defined on the s390 platform, so
test_medium_not_found() test is skipped.

Reviewed-by:   Michael Mueller <mimu@linux.vnet.ibm.com>
Signed-off-by: Mao Chuan Li  <maochuan@linux.vnet.ibm.com>
---
 tests/qemu-iotests/041 | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Max Reitz Feb. 5, 2015, 2:26 p.m. UTC | #1 
On 2015-02-04 at 22:44, Xiao Guang Chen wrote:
> From: Mao Chuan Li <maochuan@linux.vnet.ibm.com>
>
> There is no such device 'ide-cd' defined on the s390 platform, so
> test_medium_not_found() test is skipped.
>
> Reviewed-by:   Michael Mueller <mimu@linux.vnet.ibm.com>
> Signed-off-by: Mao Chuan Li  <maochuan@linux.vnet.ibm.com>
> ---
>   tests/qemu-iotests/041 | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
> index 59a8f73..4fb1b34 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 == 's390-virtio':
> +	    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 == 's390-virtio':
> +	    return
> +
>           result = self.vm.qmp('drive-mirror', device='ide1-cd0', sync='full',
>                                node_name='repair0',
>                                replaces='img1',

Please don't use tabs for indentation.

With the tabs replaced by eight spaces each:

Reviewed-by: Max Reitz <mreitz@redhat.com>
diff mbox

Patch

diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 59a8f73..4fb1b34 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 == 's390-virtio':
+	    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 == 's390-virtio':
+	    return
+
         result = self.vm.qmp('drive-mirror', device='ide1-cd0', sync='full',
                              node_name='repair0',
                              replaces='img1',